diff options
author | Yuval Mintz <yuvalmin@broadcom.com> | 2013-01-14 00:11:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:07:59 -0500 |
commit | 823e1d90797552687d2dfab2299464e5b663a8a9 (patch) | |
tree | 9e9e60c64cb49ffb87ceadb6495763fa463b276a /drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |
parent | 07ba6af465aa551326e18133c085035d2059cabc (diff) |
bnx2x: improve stop-on-error
Get better control over interrupts during panic, and allow FW to
test outgoing Tx packets when stop-on-error is allowed.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@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.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 309bbb70cf7f..757fe2c843d8 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |||
@@ -123,20 +123,18 @@ do { \ | |||
123 | } while (0) | 123 | } while (0) |
124 | 124 | ||
125 | #ifdef BNX2X_STOP_ON_ERROR | 125 | #ifdef BNX2X_STOP_ON_ERROR |
126 | void bnx2x_int_disable(struct bnx2x *bp); | ||
127 | #define bnx2x_panic() \ | 126 | #define bnx2x_panic() \ |
128 | do { \ | 127 | do { \ |
129 | bp->panic = 1; \ | 128 | bp->panic = 1; \ |
130 | BNX2X_ERR("driver assert\n"); \ | 129 | BNX2X_ERR("driver assert\n"); \ |
131 | bnx2x_int_disable(bp); \ | 130 | bnx2x_panic_dump(bp, true); \ |
132 | bnx2x_panic_dump(bp); \ | ||
133 | } while (0) | 131 | } while (0) |
134 | #else | 132 | #else |
135 | #define bnx2x_panic() \ | 133 | #define bnx2x_panic() \ |
136 | do { \ | 134 | do { \ |
137 | bp->panic = 1; \ | 135 | bp->panic = 1; \ |
138 | BNX2X_ERR("driver assert\n"); \ | 136 | BNX2X_ERR("driver assert\n"); \ |
139 | bnx2x_panic_dump(bp); \ | 137 | bnx2x_panic_dump(bp, false); \ |
140 | } while (0) | 138 | } while (0) |
141 | #endif | 139 | #endif |
142 | 140 | ||