diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2012-10-05 23:29:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:13 +0900 |
| commit | 1854f0eec5e072f33d3dc3c47170975b87b1016c (patch) | |
| tree | 72551cd4a258f19761601a401d5367feaba87819 /drivers/net/r8169.c | |
| parent | 8ffd1cb75b0d422f4ee723c79d9eccc81b6442f6 (diff) | |
| download | kernel_samsung_smdk4412-1854f0eec5e072f33d3dc3c47170975b87b1016c.zip kernel_samsung_smdk4412-1854f0eec5e072f33d3dc3c47170975b87b1016c.tar.gz kernel_samsung_smdk4412-1854f0eec5e072f33d3dc3c47170975b87b1016c.tar.bz2 | |
r8169: missing barriers.
commit 1e874e041fc7c222cbd85b20c4406070be1f687a upstream.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 9f5d8f9..7c28f07 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -4957,7 +4957,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); } @@ -5058,7 +5058,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); @@ -5069,7 +5069,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); } |