From 4074acd0b6f4114d4eda57b97b3c3647271bb8f4 Mon Sep 17 00:00:00 2001
From: Vladislav Zolotarov <vladz@broadcom.com>
Date: Tue, 19 Jul 2011 01:39:41 +0000
Subject: [PATCH] --- yaml --- r: 256503 b: refs/heads/master c:
 9505ee376739c26cf1d7d4e551d2f63b9d7e5729 h: refs/heads/master i:   256501:
 f18ea406b095522d86914eb2d13015d0eb59ba02   256499:
 6c8bf0424a794c4fb622c22a6fd61655a2712b21   256495:
 ab526d2a99aad8b63b24aa4811e6a83936a78937 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_cmn.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8e1d7f61831e..18cdf512f64b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c636322b24eb69b7c1ccdc070164de51cee3f37c
+refs/heads/master: 9505ee376739c26cf1d7d4e551d2f63b9d7e5729
diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
index 5854a6c34223..8b079dcd5b96 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/trunk/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 */