From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Tue, 9 Mar 2010 06:55:00 +0000 (+0000)
Subject: bnx2x: use smp_mb() to keep ordering of read write operations
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2d99cf16f42b1979a2c498bb6d09498dbd689978;p=openwrt%2Fstaging%2Fblogic.git

bnx2x: use smp_mb() to keep ordering of read write operations

Since we want to keep ordering of write to fp->bd_tx_cons and
netif_tx_queue_stopped(txq), what is read of txq->state, we have to use
general memory barrier.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index ed785a30e98b..9fc0f6a7a5e9 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -963,7 +963,7 @@ static int bnx2x_tx_int(struct bnx2x_fastpath *fp)
 	 * start_xmit() will miss it and cause the queue to be stopped
 	 * forever.
 	 */
-	smp_wmb();
+	smp_mb();
 
 	/* TBD need a thresh? */
 	if (unlikely(netif_tx_queue_stopped(txq))) {