aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8139cp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/8139cp.c')
-rw-r--r--drivers/net/8139cp.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 72cdf19e1be1..ca7746dd164f 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -61,6 +61,7 @@
61#include <linux/etherdevice.h> 61#include <linux/etherdevice.h>
62#include <linux/init.h> 62#include <linux/init.h>
63#include <linux/pci.h> 63#include <linux/pci.h>
64#include <linux/dma-mapping.h>
64#include <linux/delay.h> 65#include <linux/delay.h>
65#include <linux/ethtool.h> 66#include <linux/ethtool.h>
66#include <linux/mii.h> 67#include <linux/mii.h>
@@ -1732,19 +1733,19 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1732 1733
1733 /* Configure DMA attributes. */ 1734 /* Configure DMA attributes. */
1734 if ((sizeof(dma_addr_t) > 4) && 1735 if ((sizeof(dma_addr_t) > 4) &&
1735 !pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL) && 1736 !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) &&
1736 !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { 1737 !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
1737 pci_using_dac = 1; 1738 pci_using_dac = 1;
1738 } else { 1739 } else {
1739 pci_using_dac = 0; 1740 pci_using_dac = 0;
1740 1741
1741 rc = pci_set_dma_mask(pdev, 0xffffffffULL); 1742 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
1742 if (rc) { 1743 if (rc) {
1743 printk(KERN_ERR PFX "No usable DMA configuration, " 1744 printk(KERN_ERR PFX "No usable DMA configuration, "
1744 "aborting.\n"); 1745 "aborting.\n");
1745 goto err_out_res; 1746 goto err_out_res;
1746 } 1747 }
1747 rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL); 1748 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
1748 if (rc) { 1749 if (rc) {
1749 printk(KERN_ERR PFX "No usable consistent DMA configuration, " 1750 printk(KERN_ERR PFX "No usable consistent DMA configuration, "
1750 "aborting.\n"); 1751 "aborting.\n");