diff options
| author | David S. Miller | 2018-01-29 16:14:59 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-01-29 16:15:51 +0100 |
| commit | 3e3ab9ccca5b50b11bd4d16c2048b667343354bd (patch) | |
| tree | 7279f7401e7cc2b93fb7cb2bff894b5385429a68 /drivers/net/ethernet/realtek | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2018-01-26' of git://git.kernel.or... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.tar.gz kernel-qcow2-linux-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.tar.xz kernel-qcow2-linux-3e3ab9ccca5b50b11bd4d16c2048b667343354bd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 272c5962e4f7..8e91274174f1 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2235,19 +2235,14 @@ static bool rtl8169_do_counters(struct net_device *dev, u32 counter_cmd) void __iomem *ioaddr = tp->mmio_addr; dma_addr_t paddr = tp->counters_phys_addr; u32 cmd; - bool ret; RTL_W32(CounterAddrHigh, (u64)paddr >> 32); + RTL_R32(CounterAddrHigh); cmd = (u64)paddr & DMA_BIT_MASK(32); RTL_W32(CounterAddrLow, cmd); RTL_W32(CounterAddrLow, cmd | counter_cmd); - ret = rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); - - RTL_W32(CounterAddrLow, 0); - RTL_W32(CounterAddrHigh, 0); - - return ret; + return rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000); } static bool rtl8169_reset_counters(struct net_device *dev) |