Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 134528
b: refs/heads/master
c: d3d4f49
h: refs/heads/master
v: v3
  • Loading branch information
Eilon Greenstein authored and David S. Miller committed Feb 16, 2009
1 parent 145b96b commit 9d6f11c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1ef27ef42dc946a255de4cc7b878630011735d8
refs/heads/master: d3d4f49527249e87d11219a22469dff25b674c08
2 changes: 1 addition & 1 deletion trunk/drivers/net/bnx2x.h
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,


#define BNX2X_NUM_STATS 42
#define BNX2X_NUM_TESTS 8
#define BNX2X_NUM_TESTS 7

#define BNX2X_MAC_LOOPBACK 0
#define BNX2X_PHY_LOOPBACK 1
Expand Down
6 changes: 1 addition & 5 deletions trunk/drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -8732,8 +8732,7 @@ static const struct {
{ "nvram_test (online)" },
{ "interrupt_test (online)" },
{ "link_test (online)" },
{ "idle check (online)" },
{ "MC errors (online)" }
{ "idle check (online)" }
};

static int bnx2x_self_test_count(struct net_device *dev)
Expand Down Expand Up @@ -9202,9 +9201,6 @@ static void bnx2x_self_test(struct net_device *dev,
buf[5] = 1;
etest->flags |= ETH_TEST_FL_FAILED;
}
buf[7] = bnx2x_mc_assert(bp);
if (buf[7] != 0)
etest->flags |= ETH_TEST_FL_FAILED;

#ifdef BNX2X_EXTRA_DEBUG
bnx2x_panic_dump(bp);
Expand Down

0 comments on commit 9d6f11c

Please sign in to comment.