diff options
Diffstat (limited to 'drivers/net/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index a09e3a7cac4f..02330f3d5a55 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -1530,7 +1530,7 @@ static void cp_get_ethtool_stats (struct net_device *dev, | |||
1530 | 1530 | ||
1531 | /* begin NIC statistics dump */ | 1531 | /* begin NIC statistics dump */ |
1532 | cpw32(StatsAddr + 4, (u64)dma >> 32); | 1532 | cpw32(StatsAddr + 4, (u64)dma >> 32); |
1533 | cpw32(StatsAddr, ((u64)dma & DMA_32BIT_MASK) | DumpStats); | 1533 | cpw32(StatsAddr, ((u64)dma & DMA_BIT_MASK(32)) | DumpStats); |
1534 | cpr32(StatsAddr); | 1534 | cpr32(StatsAddr); |
1535 | 1535 | ||
1536 | for (i = 0; i < 1000; i++) { | 1536 | for (i = 0; i < 1000; i++) { |
@@ -1929,19 +1929,19 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1929 | 1929 | ||
1930 | /* Configure DMA attributes. */ | 1930 | /* Configure DMA attributes. */ |
1931 | if ((sizeof(dma_addr_t) > 4) && | 1931 | if ((sizeof(dma_addr_t) > 4) && |
1932 | !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) && | 1932 | !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) && |
1933 | !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { | 1933 | !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { |
1934 | pci_using_dac = 1; | 1934 | pci_using_dac = 1; |
1935 | } else { | 1935 | } else { |
1936 | pci_using_dac = 0; | 1936 | pci_using_dac = 0; |
1937 | 1937 | ||
1938 | rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 1938 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
1939 | if (rc) { | 1939 | if (rc) { |
1940 | dev_err(&pdev->dev, | 1940 | dev_err(&pdev->dev, |
1941 | "No usable DMA configuration, aborting.\n"); | 1941 | "No usable DMA configuration, aborting.\n"); |
1942 | goto err_out_res; | 1942 | goto err_out_res; |
1943 | } | 1943 | } |
1944 | rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 1944 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
1945 | if (rc) { | 1945 | if (rc) { |
1946 | dev_err(&pdev->dev, | 1946 | dev_err(&pdev->dev, |
1947 | "No usable consistent DMA configuration, " | 1947 | "No usable consistent DMA configuration, " |