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