From 34d124dd47b5027b79ce965889f9469d8ccf353b Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Wed, 6 May 2009 16:46:47 -0700
Subject: [PATCH] --- yaml --- r: 144767 b: refs/heads/master c:
 581daf7e00c5e766f26aff80a61a860a17b0d75a h: refs/heads/master i:   144765:
 9d1e52c145be3c5282533f14b3976bd2814b20ce   144763:
 c3ee4c4d077d8cadb15b42de6121b95830eaa05f   144759:
 ead17440d10897580fb0dc2ba7afcd09f9355fd3   144751:
 0b0778fab2b98b3aa0d6f1faa301b7a3938f45f7   144735:
 1b57bf3b98c0179d908f823141d9789ff2c78c67   144703:
 1fd508f13b77c8c487be6e6bc61365d294e803ae   144639:
 e2c767faacf047e614f9d3e627ecc2a79983f15b v: v3

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

diff --git a/[refs] b/[refs]
index 9a5ffe8851b0..21ec50d9d209 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6473990c7f0565fca2007f8662395d122e30f0d8
+refs/heads/master: 581daf7e00c5e766f26aff80a61a860a17b0d75a
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index d47839184a06..b0cb29d4cc01 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -54,8 +54,8 @@
 
 #define DRV_MODULE_NAME		"bnx2"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"2.0.0"
-#define DRV_MODULE_RELDATE	"April 2, 2009"
+#define DRV_MODULE_VERSION	"2.0.1"
+#define DRV_MODULE_RELDATE	"May 6, 2009"
 #define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-4.6.16.fw"
 #define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-4.6.16.fw"
 #define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-4.6.17.fw"
@@ -2600,6 +2600,7 @@ bnx2_get_hw_tx_cons(struct bnx2_napi *bnapi)
 	/* Tell compiler that status block fields can change. */
 	barrier();
 	cons = *bnapi->hw_tx_cons_ptr;
+	barrier();
 	if (unlikely((cons & MAX_TX_DESC_CNT) == MAX_TX_DESC_CNT))
 		cons++;
 	return cons;
@@ -2879,6 +2880,7 @@ bnx2_get_hw_rx_cons(struct bnx2_napi *bnapi)
 	/* Tell compiler that status block fields can change. */
 	barrier();
 	cons = *bnapi->hw_rx_cons_ptr;
+	barrier();
 	if (unlikely((cons & MAX_RX_DESC_CNT) == MAX_RX_DESC_CNT))
 		cons++;
 	return cons;