diff options
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index fe676d38d342..0b6e8c896835 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -1148,7 +1148,7 @@ static void rtl8169_update_counters(struct net_device *dev) | |||
1148 | return; | 1148 | return; |
1149 | 1149 | ||
1150 | RTL_W32(CounterAddrHigh, (u64)paddr >> 32); | 1150 | RTL_W32(CounterAddrHigh, (u64)paddr >> 32); |
1151 | cmd = (u64)paddr & DMA_32BIT_MASK; | 1151 | cmd = (u64)paddr & DMA_BIT_MASK(32); |
1152 | RTL_W32(CounterAddrLow, cmd); | 1152 | RTL_W32(CounterAddrLow, cmd); |
1153 | RTL_W32(CounterAddrLow, cmd | CounterDump); | 1153 | RTL_W32(CounterAddrLow, cmd | CounterDump); |
1154 | 1154 | ||
@@ -2050,7 +2050,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2050 | tp->cp_cmd |= PCIDAC; | 2050 | tp->cp_cmd |= PCIDAC; |
2051 | dev->features |= NETIF_F_HIGHDMA; | 2051 | dev->features |= NETIF_F_HIGHDMA; |
2052 | } else { | 2052 | } else { |
2053 | rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 2053 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
2054 | if (rc < 0) { | 2054 | if (rc < 0) { |
2055 | if (netif_msg_probe(tp)) { | 2055 | if (netif_msg_probe(tp)) { |
2056 | dev_err(&pdev->dev, | 2056 | dev_err(&pdev->dev, |
@@ -2343,9 +2343,9 @@ static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp, | |||
2343 | * Switching from MMIO to I/O access fixes the issue as well. | 2343 | * Switching from MMIO to I/O access fixes the issue as well. |
2344 | */ | 2344 | */ |
2345 | RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32); | 2345 | RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32); |
2346 | RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_32BIT_MASK); | 2346 | RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_BIT_MASK(32)); |
2347 | RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr) >> 32); | 2347 | RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr) >> 32); |
2348 | RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_32BIT_MASK); | 2348 | RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32)); |
2349 | } | 2349 | } |
2350 | 2350 | ||
2351 | static u16 rtl_rw_cpluscmd(void __iomem *ioaddr) | 2351 | static u16 rtl_rw_cpluscmd(void __iomem *ioaddr) |