summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex
diff options
context:
space:
mode:
authorPadmanabh Ratnakar2012-04-25 03:46:28 +0200
committerDavid S. Miller2012-04-26 11:03:31 +0200
commita70473949698c1c46e5523e1810a0a0f904a1fd2 (patch)
tree9dda768596a6f884ccc1ee849ddfb988a567e7f2 /drivers/net/ethernet/emulex
parentbe2net: Fix FW download in Lancer (diff)
downloadkernel-qcow2-linux-a70473949698c1c46e5523e1810a0a0f904a1fd2.tar.gz
kernel-qcow2-linux-a70473949698c1c46e5523e1810a0a0f904a1fd2.tar.xz
kernel-qcow2-linux-a70473949698c1c46e5523e1810a0a0f904a1fd2.zip
be2net: Fix ethtool self test for Lancer
Lancer does not support DDR self test. Fix ethtool self test by skipping this test for Lancer. Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index dc9f74c69c40..0c6f06efce12 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -793,7 +793,7 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
}
}
- if (be_test_ddr_dma(adapter) != 0) {
+ if (!lancer_chip(adapter) && be_test_ddr_dma(adapter) != 0) {
data[3] = 1;
test->flags |= ETH_TEST_FL_FAILED;
}