|
@@ -60,6 +60,7 @@
|
|
|
#include <linux/etherdevice.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/pci.h>
|
|
|
+#include <linux/dma-mapping.h>
|
|
|
#include <linux/delay.h>
|
|
|
#include <linux/ethtool.h>
|
|
|
#include <linux/mii.h>
|
|
@@ -1701,19 +1702,19 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
|
|
|
/* Configure DMA attributes. */
|
|
|
if ((sizeof(dma_addr_t) > 4) &&
|
|
|
- !pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL) &&
|
|
|
- !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
|
|
|
+ !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) &&
|
|
|
+ !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
|
|
|
pci_using_dac = 1;
|
|
|
} else {
|
|
|
pci_using_dac = 0;
|
|
|
|
|
|
- rc = pci_set_dma_mask(pdev, 0xffffffffULL);
|
|
|
+ rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
|
|
if (rc) {
|
|
|
printk(KERN_ERR PFX "No usable DMA configuration, "
|
|
|
"aborting.\n");
|
|
|
goto err_out_res;
|
|
|
}
|
|
|
- rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
|
|
|
+ rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
|
|
|
if (rc) {
|
|
|
printk(KERN_ERR PFX "No usable consistent DMA configuration, "
|
|
|
"aborting.\n");
|