diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2012-01-27 09:05:38 -0500 |
---|---|---|
committer | Francois Romieu <romieu@fr.zoreil.com> | 2012-01-27 12:44:59 -0500 |
commit | 1e874e041fc7c222cbd85b20c4406070be1f687a (patch) | |
tree | 0632f111a1387fe3a33e5b9724b8452fccd70a7f /drivers/net | |
parent | 9085cdfa2f9f04d8678465748e2cced6e3f02e26 (diff) |
r8169: missing barriers.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 610f4b3655c7..8dd13f5a9203 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -5552,7 +5552,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, | |||
5552 | 5552 | ||
5553 | if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) { | 5553 | if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) { |
5554 | netif_stop_queue(dev); | 5554 | netif_stop_queue(dev); |
5555 | smp_rmb(); | 5555 | smp_mb(); |
5556 | if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS) | 5556 | if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS) |
5557 | netif_wake_queue(dev); | 5557 | netif_wake_queue(dev); |
5558 | } | 5558 | } |
@@ -5653,7 +5653,7 @@ static void rtl8169_tx_interrupt(struct net_device *dev, | |||
5653 | 5653 | ||
5654 | if (tp->dirty_tx != dirty_tx) { | 5654 | if (tp->dirty_tx != dirty_tx) { |
5655 | tp->dirty_tx = dirty_tx; | 5655 | tp->dirty_tx = dirty_tx; |
5656 | smp_wmb(); | 5656 | smp_mb(); |
5657 | if (netif_queue_stopped(dev) && | 5657 | if (netif_queue_stopped(dev) && |
5658 | (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) { | 5658 | (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) { |
5659 | netif_wake_queue(dev); | 5659 | netif_wake_queue(dev); |
@@ -5664,7 +5664,6 @@ static void rtl8169_tx_interrupt(struct net_device *dev, | |||
5664 | * of start_xmit activity is detected (if it is not detected, | 5664 | * of start_xmit activity is detected (if it is not detected, |
5665 | * it is slow enough). -- FR | 5665 | * it is slow enough). -- FR |
5666 | */ | 5666 | */ |
5667 | smp_rmb(); | ||
5668 | if (tp->cur_tx != dirty_tx) | 5667 | if (tp->cur_tx != dirty_tx) |
5669 | RTL_W8(TxPoll, NPQ); | 5668 | RTL_W8(TxPoll, NPQ); |
5670 | } | 5669 | } |