diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-06-29 15:38:15 -0400 | 
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-29 19:58:24 -0400 | 
| commit | 6c4f095eae35e83eb6148dec7f72874eeadf0c9b (patch) | |
| tree | 1be263c4968b5268e0a3ebb1650a79f0833e3215 | |
| parent | 745720e58303f940e12944bf7fab52bc9ce48bda (diff) | |
[BNX2]: Turn off link during shutdown
Minor change in shutdown logic to effect a link down.
Update version to 1.4.43.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bnx2.c | 8 | ||||
| -rw-r--r-- | drivers/net/bnx2.h | 1 | 
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index e59cb5925154..d55b0f7939a6 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c  | |||
| @@ -57,8 +57,8 @@ | |||
| 57 | 57 | ||
| 58 | #define DRV_MODULE_NAME "bnx2" | 58 | #define DRV_MODULE_NAME "bnx2" | 
| 59 | #define PFX DRV_MODULE_NAME ": " | 59 | #define PFX DRV_MODULE_NAME ": " | 
| 60 | #define DRV_MODULE_VERSION "1.4.42" | 60 | #define DRV_MODULE_VERSION "1.4.43" | 
| 61 | #define DRV_MODULE_RELDATE "June 12, 2006" | 61 | #define DRV_MODULE_RELDATE "June 28, 2006" | 
| 62 | 62 | ||
| 63 | #define RUN_AT(x) (jiffies + (x)) | 63 | #define RUN_AT(x) (jiffies + (x)) | 
| 64 | 64 | ||
| @@ -4541,7 +4541,7 @@ bnx2_close(struct net_device *dev) | |||
| 4541 | bnx2_netif_stop(bp); | 4541 | bnx2_netif_stop(bp); | 
| 4542 | del_timer_sync(&bp->timer); | 4542 | del_timer_sync(&bp->timer); | 
| 4543 | if (bp->flags & NO_WOL_FLAG) | 4543 | if (bp->flags & NO_WOL_FLAG) | 
| 4544 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD; | 4544 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN; | 
| 4545 | else if (bp->wol) | 4545 | else if (bp->wol) | 
| 4546 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; | 4546 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; | 
| 4547 | else | 4547 | else | 
| @@ -5978,7 +5978,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 5978 | netif_device_detach(dev); | 5978 | netif_device_detach(dev); | 
| 5979 | del_timer_sync(&bp->timer); | 5979 | del_timer_sync(&bp->timer); | 
| 5980 | if (bp->flags & NO_WOL_FLAG) | 5980 | if (bp->flags & NO_WOL_FLAG) | 
| 5981 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD; | 5981 | reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN; | 
| 5982 | else if (bp->wol) | 5982 | else if (bp->wol) | 
| 5983 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; | 5983 | reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL; | 
| 5984 | else | 5984 | else | 
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 5845e334941b..658c5ee95c73 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h  | |||
| @@ -4174,6 +4174,7 @@ struct fw_info { | |||
| 4174 | #define BNX2_DRV_MSG_CODE_PULSE 0x06000000 | 4174 | #define BNX2_DRV_MSG_CODE_PULSE 0x06000000 | 
| 4175 | #define BNX2_DRV_MSG_CODE_DIAG 0x07000000 | 4175 | #define BNX2_DRV_MSG_CODE_DIAG 0x07000000 | 
| 4176 | #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL 0x09000000 | 4176 | #define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL 0x09000000 | 
| 4177 | #define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN 0x0b000000 | ||
| 4177 | 4178 | ||
| 4178 | #define BNX2_DRV_MSG_DATA 0x00ff0000 | 4179 | #define BNX2_DRV_MSG_DATA 0x00ff0000 | 
| 4179 | #define BNX2_DRV_MSG_DATA_WAIT0 0x00010000 | 4180 | #define BNX2_DRV_MSG_DATA_WAIT0 0x00010000 | 
