From: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Date: Wed, 25 Apr 2012 01:46:28 +0000 (+0000)
Subject: be2net: Fix ethtool self test for Lancer
X-Git-Tag: v2.6.39-400.9.0~423^2~124^2~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0e7cd3fd1bc0805895452ac9a9bec2084e43b2fe;p=users%2Fjedix%2Flinux-maple.git

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>
---

diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 506ac6b8f9aaa..b18b13fbac881 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -750,7 +750,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;
 	}