diff options
| author | David Dillow <dave@thedillows.org> | 2010-03-03 16:33:10 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 15:02:51 -0700 |
| commit | 669eda1d13d3ad19f10a05b22f7e07e413508b58 (patch) | |
| tree | bb73600b225362d951596bfa732cf9e24c9e4642 | |
| parent | 4c001c0bb68a1672bd85f08f44a3901a5e0382a7 (diff) | |
| download | kernel-crypto-669eda1d13d3ad19f10a05b22f7e07e413508b58.tar.gz kernel-crypto-669eda1d13d3ad19f10a05b22f7e07e413508b58.tar.xz kernel-crypto-669eda1d13d3ad19f10a05b22f7e07e413508b58.zip | |
r8169: use correct barrier between cacheable and non-cacheable memory
commit 4c020a961a812ffae9846b917304cea504c3a733 upstream.
r8169 needs certain writes to be visible to other CPUs or the NIC before
touching the hardware, but was using smp_wmb() which is only required to
order cacheable memory access. Switch to wmb() which is required to
order both cacheable and non-cacheable memory.
Noticed by Catalin Marinas and Paul Mackerras.
Signed-off-by: David Dillow <dave@thedillows.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 3db85daa367..f65bb69a086 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -4316,7 +4316,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 */ @@ -4675,7 +4675,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); } |