bnx2: Add missing netif_tx_disable() in bnx2_close()

to stop all tx queues.  Update version to 2.2.3.

(cherry picked from commit d2e553bca89596b7ac35f8abcec9c9b93f772fc2)
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 353b1afa06ac8ce56f7c6ab610cec16f14e6d790..8d398426da2cc4e03e6faf4c81036068fdfd860c 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -58,8 +58,8 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME                "bnx2"
-#define DRV_MODULE_VERSION     "2.2.2"
-#define DRV_MODULE_RELDATE     "June 16, 2012"
+#define DRV_MODULE_VERSION     "2.2.3"
+#define DRV_MODULE_RELDATE     "June 27, 2012"
 #define FW_MIPS_FILE_06                "bnx2/bnx2-mips-06-6.2.3.fw"
 #define FW_RV2P_FILE_06                "bnx2/bnx2-rv2p-06-6.0.15.fw"
 #define FW_MIPS_FILE_09                "bnx2/bnx2-mips-09-6.2.1b.fw"
@@ -6700,6 +6700,7 @@ bnx2_close(struct net_device *dev)
 
        bnx2_disable_int_sync(bp);
        bnx2_napi_disable(bp);
+       netif_tx_disable(dev);
        del_timer_sync(&bp->timer);
        bnx2_shutdown_chip(bp);
        bnx2_free_irq(bp);