Commit 6c4f095e authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 745720e5

drivers/net/bnx2.c

+4 −4
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.4.42"

#define DRV_MODULE_RELDATE	"June 12, 2006"

#define DRV_MODULE_VERSION	"1.4.43"

#define DRV_MODULE_RELDATE	"June 28, 2006"



#define RUN_AT(x) (jiffies + (x))
@@ -4541,7 +4541,7 @@ bnx2_close(struct net_device *dev) 
	bnx2_netif_stop(bp);

	del_timer_sync(&bp->timer);

	if (bp->flags & NO_WOL_FLAG)

		reset_code = BNX2_DRV_MSG_CODE_UNLOAD;

		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;

	else if (bp->wol)

		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;

	else
@@ -5978,7 +5978,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state) 
	netif_device_detach(dev);

	del_timer_sync(&bp->timer);

	if (bp->flags & NO_WOL_FLAG)

		reset_code = BNX2_DRV_MSG_CODE_UNLOAD;

		reset_code = BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN;

	else if (bp->wol)

		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_WOL;

	else

drivers/net/bnx2.h

+1 −0
Original line number Diff line number Diff line
@@ -4174,6 +4174,7 @@ struct fw_info { 
#define BNX2_DRV_MSG_CODE_PULSE			 0x06000000

#define BNX2_DRV_MSG_CODE_DIAG			 0x07000000

#define BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL	 0x09000000

#define BNX2_DRV_MSG_CODE_UNLOAD_LNK_DN		 0x0b000000



#define BNX2_DRV_MSG_DATA			 0x00ff0000

#define BNX2_DRV_MSG_DATA_WAIT0			 0x00010000