diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-24 23:55:24 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-25 01:07:17 +0100 |
commit | 2e05b625a813f79ff4a255d120883ea8aa539972 (patch) | |
tree | 9215f884a81b20528d721ba38e06f24507ec8c7a /patches/unified-drivers/network | |
parent | 8ccd930335cc1019122a24625d38e8e64677ec59 (diff) |
compat-drivers: deactivate loopback testing for older kernels
ETH_TEST_FL_EXTERNAL_LB and ETH_TEST_FL_EXTERNAL_LB_DONE are not
available in kernel version < 3.1.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/unified-drivers/network')
-rw-r--r-- | patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch b/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch new file mode 100644 index 00000000..3ed96a43 --- /dev/null +++ b/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch @@ -0,0 +1,25 @@ +--- a/drivers/net/ethernet/atheros/alx/alx_ethtool.c ++++ b/drivers/net/ethernet/atheros/alx/alx_ethtool.c +@@ -1687,7 +1687,9 @@ static void alx_self_test(struct net_dev + { + struct alx_adapter *adpt = netdev_priv(netdev); + bool if_running = netif_running(netdev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) + bool phy_lpback = etest->flags & ETH_TEST_FL_EXTERNAL_LB; ++#endif + + ALX_FLAG_SET(adpt, TESTING); + memset(data, 0, sizeof(u64) * ALX_TEST_LEN); +@@ -1707,10 +1709,12 @@ static void alx_self_test(struct net_dev + if (alx_diag_interrupt(adpt, &data[2])) + etest->flags |= ETH_TEST_FL_FAILED; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) + if (phy_lpback) + etest->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE; + if (alx_diag_loopback(adpt, &data[3], phy_lpback)) + etest->flags |= ETH_TEST_FL_FAILED; ++#endif + + } else { + netif_info(adpt, hw, adpt->netdev, "online test start...\n"); |