aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2011-07-18 21:39:41 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-19 12:57:48 -0400
commit9505ee376739c26cf1d7d4e551d2f63b9d7e5729 (patch)
treef4daddb3d4207c25f8e2675f3833c6099ed06902 /drivers/net/bnx2x
parentc636322b24eb69b7c1ccdc070164de51cee3f37c (diff)
bnx2x: stop tx before CNIC_STOP
It may take some time to cnic to respond, this prevents tx_timeout when it happens. Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x')
-rw-r--r--drivers/net/bnx2x/bnx2x_cmn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 5854a6c34223..8b079dcd5b96 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1989,6 +1989,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
1989 return -EINVAL; 1989 return -EINVAL;
1990 } 1990 }
1991 1991
1992 /* Stop Tx */
1993 bnx2x_tx_disable(bp);
1994
1992#ifdef BCM_CNIC 1995#ifdef BCM_CNIC
1993 bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD); 1996 bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD);
1994#endif 1997#endif
@@ -1997,9 +2000,6 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)
1997 2000
1998 bp->rx_mode = BNX2X_RX_MODE_NONE; 2001 bp->rx_mode = BNX2X_RX_MODE_NONE;
1999 2002
2000 /* Stop Tx */
2001 bnx2x_tx_disable(bp);
2002
2003 del_timer_sync(&bp->timer); 2003 del_timer_sync(&bp->timer);
2004 2004
2005 /* Set ALWAYS_ALIVE bit in shmem */ 2005 /* Set ALWAYS_ALIVE bit in shmem */