aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bnx2x.h2
-rw-r--r--drivers/net/bnx2x_main.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 89a72c86ef8f..cfbeabb8e5ea 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -1009,7 +1009,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
1009 1009
1010 1010
1011#define BNX2X_NUM_STATS 42 1011#define BNX2X_NUM_STATS 42
1012#define BNX2X_NUM_TESTS 8 1012#define BNX2X_NUM_TESTS 7
1013 1013
1014#define BNX2X_MAC_LOOPBACK 0 1014#define BNX2X_MAC_LOOPBACK 0
1015#define BNX2X_PHY_LOOPBACK 1 1015#define BNX2X_PHY_LOOPBACK 1
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index ea7d86d2da92..c27be17131f5 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -8732,8 +8732,7 @@ static const struct {
8732 { "nvram_test (online)" }, 8732 { "nvram_test (online)" },
8733 { "interrupt_test (online)" }, 8733 { "interrupt_test (online)" },
8734 { "link_test (online)" }, 8734 { "link_test (online)" },
8735 { "idle check (online)" }, 8735 { "idle check (online)" }
8736 { "MC errors (online)" }
8737}; 8736};
8738 8737
8739static int bnx2x_self_test_count(struct net_device *dev) 8738static int bnx2x_self_test_count(struct net_device *dev)
@@ -9202,9 +9201,6 @@ static void bnx2x_self_test(struct net_device *dev,
9202 buf[5] = 1; 9201 buf[5] = 1;
9203 etest->flags |= ETH_TEST_FL_FAILED; 9202 etest->flags |= ETH_TEST_FL_FAILED;
9204 } 9203 }
9205 buf[7] = bnx2x_mc_assert(bp);
9206 if (buf[7] != 0)
9207 etest->flags |= ETH_TEST_FL_FAILED;
9208 9204
9209#ifdef BNX2X_EXTRA_DEBUG 9205#ifdef BNX2X_EXTRA_DEBUG
9210 bnx2x_panic_dump(bp); 9206 bnx2x_panic_dump(bp);