diff options
| author | Eliezer Tamir <eliezert@broadcom.com> | 2008-02-28 11:56:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-28 11:56:57 -0800 |
| commit | 228241eb58ad13e7cf2ddd9c92eabb5c3055cf5c (patch) | |
| tree | 765d0de072a2eab6575ff735a05e8ea492c4d08a /drivers/net/bnx2x.h | |
| parent | 877e9aa4c31d8d1670b21824b819929435f46579 (diff) | |
| download | blackbird-obmc-linux-228241eb58ad13e7cf2ddd9c92eabb5c3055cf5c.tar.gz blackbird-obmc-linux-228241eb58ad13e7cf2ddd9c92eabb5c3055cf5c.zip | |
[BNX2X]: fix slowpath races and locking
Fixed locking between fastpath and slowpath operations.
Corrected order of traffic disabling to prevent race when going down
under traffic.
- first have the microcode drop all incoming packets
- then do the slowpath stuff
- only then reset the MAC
Got rid of in_reset_task.
Remove_one() and friends would deference a null pointer if init_one
failed.
Signed-off-by: Eliezer Tamir <eliezert@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index e2a36e850fc2..6a86afbc7525 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h @@ -545,8 +545,6 @@ struct bnx2x { spinlock_t phy_lock; struct work_struct reset_task; - u16 in_reset_task; - struct work_struct sp_task; struct timer_list timer; @@ -560,7 +558,6 @@ struct bnx2x { #define CHIP_ID(bp) (((bp)->chip_id) & 0xfffffff0) #define CHIP_NUM(bp) (((bp)->chip_id) & 0xffff0000) -#define CHIP_NUM_5710 0x57100000 #define CHIP_REV(bp) (((bp)->chip_id) & 0x0000f000) #define CHIP_REV_Ax 0x00000000 |
