From 716fe5cca2beb0c2e0b54f6bda4f6fd27cb10fe1 Mon Sep 17 00:00:00 2001 From: David Dillow Date: Wed, 3 Mar 2010 16:33:10 +0000 Subject: [PATCH] --- yaml --- r: 187931 b: refs/heads/master c: 4c020a961a812ffae9846b917304cea504c3a733 h: refs/heads/master i: 187929: c82cf5137656244f4c9a85d84a3408b2ee21fcbe 187927: a9cfb2533e9a851cabca99cd9682c96a1b273add v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f4b4bd0a71c4..258ce3cadabb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0021b252eaf65ca07ed14f0d66425dd9ccab9a6 +refs/heads/master: 4c020a961a812ffae9846b917304cea504c3a733 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index dfc3573c91bb..9d3ebf3e975e 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -4270,7 +4270,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, tp->cur_tx += frags + 1; - smp_wmb(); + wmb(); RTL_W8(TxPoll, NPQ); /* set polling bit */ @@ -4621,7 +4621,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) * until it does. */ tp->intr_mask = 0xffff; - smp_wmb(); + wmb(); RTL_W16(IntrMask, tp->intr_event); }