From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 27 Jan 2012 14:05:38 +0000 (+0100)
Subject: r8169: missing barriers.
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c6e0bf9b793087c2001ff9f85acc7bdc0026153;p=users%2Fjedix%2Flinux-maple.git

r8169: missing barriers.

(cherry picked from commit 1e874e041fc7c222cbd85b20c4406070be1f687a)
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a5cddede9af8..fad6b5538f71 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -5549,7 +5549,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
 
 	if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
 		netif_stop_queue(dev);
-		smp_rmb();
+		smp_mb();
 		if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)
 			netif_wake_queue(dev);
 	}
@@ -5650,7 +5650,7 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 
 	if (tp->dirty_tx != dirty_tx) {
 		tp->dirty_tx = dirty_tx;
-		smp_wmb();
+		smp_mb();
 		if (netif_queue_stopped(dev) &&
 		    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
 			netif_wake_queue(dev);
@@ -5661,7 +5661,6 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 		 * of start_xmit activity is detected (if it is not detected,
 		 * it is slow enough). -- FR
 		 */
-		smp_rmb();
 		if (tp->cur_tx != dirty_tx)
 			RTL_W8(TxPoll, NPQ);
 	}