From: Padmanabh Ratnakar Date: Wed, 25 Apr 2012 01:46:28 +0000 Subject: [PATCH 46/58] be2net: Fix ethtool self test for Lancer commit a70473949698c1c46e5523e1810a0a0f904a1fd2 upstream. Lancer does not support DDR self test. Fix ethtool self test by skipping this test for Lancer. Signed-off-by: Padmanabh Ratnakar Signed-off-by: David S. Miller --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index 076adeb..9d71bad 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; } -- 1.7.10