summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
diff options
context:
space:
mode:
authorMerav Sicron2012-06-19 09:48:23 +0200
committerDavid S. Miller2012-06-19 23:34:34 +0200
commitcf2c1df62e065bfc15e38daf2d3479a56b320f29 (patch)
tree1fa246ecbcd525ba8181369ce379f85ef49ed2ba /drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
parentbnx2x: Add support for external LB (diff)
downloadkernel-qcow2-linux-cf2c1df62e065bfc15e38daf2d3479a56b320f29.tar.gz
kernel-qcow2-linux-cf2c1df62e065bfc15e38daf2d3479a56b320f29.tar.xz
kernel-qcow2-linux-cf2c1df62e065bfc15e38daf2d3479a56b320f29.zip
bnx2x: Return only online tests for MF
1. In multi-function device, show only the online tests in self-test results as only these test are performed (offline tests cannot be performed as they may corrupt the traffic of other functions on the same physical port). Note that multi-function mode cannot change while the driver is up. 2. Check result code in NIC load and act accordingly. Signed-off-by: Merav Sicron <meravs@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x.h')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 4335f9f51e6f..8ee4bfc1b0bb 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1900,8 +1900,10 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
#define PCICFG_LINK_SPEED 0xf0000
#define PCICFG_LINK_SPEED_SHIFT 16
-
-#define BNX2X_NUM_TESTS 8
+#define BNX2X_NUM_TESTS_SF 7
+#define BNX2X_NUM_TESTS_MF 3
+#define BNX2X_NUM_TESTS(bp) (IS_MF(bp) ? BNX2X_NUM_TESTS_MF : \
+ BNX2X_NUM_TESTS_SF)
#define BNX2X_PHY_LOOPBACK 0
#define BNX2X_MAC_LOOPBACK 1