From 0b464c2e5fc719f5be74f6cab4e3b09100f3c008 Mon Sep 17 00:00:00 2001
From: Vlad Zolotarov <vlad@scalemp.com>
Date: Sun, 5 Feb 2012 15:24:39 +0000
Subject: [PATCH] --- yaml --- r: 289903 b: refs/heads/master c:
 94bf91baf3a16ec274de3cd913be3033c029f853 h: refs/heads/master i:   289901:
 d7463f8bb5745da492d6287a52950d1ff4d6ea4f   289899:
 10fa1f4b05e65673de584bade252c5ef143d9137   289895:
 3679ec1eb7d9b25387f3c6db43b8fb895c09fd43   289887:
 d9f4608e74457115b5277f88c30254ed9e136f96 v: v3

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

diff --git a/[refs] b/[refs]
index 80fc620a636c..0f2967fc651d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b033281f618fa40ee1b24a60cd8043b4979bfee4
+refs/heads/master: 94bf91baf3a16ec274de3cd913be3033c029f853
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c
index 2ab31daef80f..7105989ba658 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2.c
@@ -6565,6 +6565,9 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	}
 	txbd->tx_bd_vlan_tag_flags |= TX_BD_FLAGS_END;
 
+	/* Sync BD data before updating TX mailbox */
+	wmb();
+
 	netdev_tx_sent_queue(txq, skb->len);
 
 	prod = NEXT_TX_BD(prod);