From ed65172097a68ac5f5a3c85869f4e582c9b84f04 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Wed, 27 Jun 2012 15:08:24 +0000
Subject: [PATCH] --- yaml --- r: 314679 b: refs/heads/master c:
 d2e553bca89596b7ac35f8abcec9c9b93f772fc2 h: refs/heads/master i:   314677:
 f11482b1a930eafcbd1932827cbf673374eb9d6c   314675:
 bfc9ceda3324b7eb4ee4a480c596180c734a9daf   314671:
 20d6faebadd64c699dc37f7a269109616868395d v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9a5380f4be4b..aa766ef0b4c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7947c9ce17c4b51122cfcef3c2e9e2632eb96a67
+refs/heads/master: d2e553bca89596b7ac35f8abcec9c9b93f772fc2
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c
index e6116ecddd16..9eb7624639b9 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2.c
+++ b/trunk/drivers/net/ethernet/broadcom/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"
@@ -6703,6 +6703,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);