lkml.org 
[lkml]   [2012]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 68/82] r8169: missing barriers.
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Francois Romieu <romieu@fr.zoreil.com>

    [ 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);
    }



    \
     
     \ /
      Last update: 2012-06-08 08:22    [W:3.143 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site