mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-26 13:57:59 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From c354bf6217e04a41a963b465634ff37450c68c1e Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Fri, 27 Jan 2012 15:05:38 +0100
|
|
Subject: [PATCH 68/86] r8169: missing barriers.
|
|
|
|
[ Upstream commit 1e874e041fc7c222cbd85b20c4406070be1f687a ]
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Hayes Wang <hayeswang@realtek.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
|
|
index 697cae3..5104d76 100644
|
|
--- a/drivers/net/ethernet/realtek/r8169.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169.c
|
|
@@ -5562,7 +5562,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);
|
|
}
|
|
@@ -5663,7 +5663,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);
|
|
@@ -5674,7 +5674,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);
|
|
}
|
|
--
|
|
1.7.9.5
|
|
|