diff options
| author | Vladislav Zolotarov <vladz@broadcom.com> | 2011-07-19 01:39:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-19 09:57:48 -0700 |
| commit | 9505ee376739c26cf1d7d4e551d2f63b9d7e5729 (patch) | |
| tree | f4daddb3d4207c25f8e2675f3833c6099ed06902 /drivers/net | |
| parent | c636322b24eb69b7c1ccdc070164de51cee3f37c (diff) | |
| download | linux-stable-9505ee376739c26cf1d7d4e551d2f63b9d7e5729.tar.gz linux-stable-9505ee376739c26cf1d7d4e551d2f63b9d7e5729.tar.bz2 linux-stable-9505ee376739c26cf1d7d4e551d2f63b9d7e5729.zip | |
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')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 6 |
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) return -EINVAL; } + /* Stop Tx */ + bnx2x_tx_disable(bp); + #ifdef BCM_CNIC bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD); #endif @@ -1997,9 +2000,6 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) bp->rx_mode = BNX2X_RX_MODE_NONE; - /* Stop Tx */ - bnx2x_tx_disable(bp); - del_timer_sync(&bp->timer); /* Set ALWAYS_ALIVE bit in shmem */ |