aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2012-06-27 11:08:24 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-28 00:20:09 -0400
commitd2e553bca89596b7ac35f8abcec9c9b93f772fc2 (patch)
tree0a24b585f906340c20bb0024fcf5f0b8a626ed9d /drivers
parent7947c9ce17c4b51122cfcef3c2e9e2632eb96a67 (diff)
bnx2: Add missing netif_tx_disable() in bnx2_close()
to stop all tx queues. Update version to 2.2.3. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index e6116ecddd16..9eb7624639b9 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -58,8 +58,8 @@
58#include "bnx2_fw.h" 58#include "bnx2_fw.h"
59 59
60#define DRV_MODULE_NAME "bnx2" 60#define DRV_MODULE_NAME "bnx2"
61#define DRV_MODULE_VERSION "2.2.2" 61#define DRV_MODULE_VERSION "2.2.3"
62#define DRV_MODULE_RELDATE "June 16, 2012" 62#define DRV_MODULE_RELDATE "June 27, 2012"
63#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.2.3.fw" 63#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.2.3.fw"
64#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-6.0.15.fw" 64#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-6.0.15.fw"
65#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-6.2.1b.fw" 65#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-6.2.1b.fw"
@@ -6703,6 +6703,7 @@ bnx2_close(struct net_device *dev)
6703 6703
6704 bnx2_disable_int_sync(bp); 6704 bnx2_disable_int_sync(bp);
6705 bnx2_napi_disable(bp); 6705 bnx2_napi_disable(bp);
6706 netif_tx_disable(dev);
6706 del_timer_sync(&bp->timer); 6707 del_timer_sync(&bp->timer);
6707 bnx2_shutdown_chip(bp); 6708 bnx2_shutdown_chip(bp);
6708 bnx2_free_irq(bp); 6709 bnx2_free_irq(bp);