|
@@ -37,6 +37,7 @@
|
|
|
#include <linux/tcp.h>
|
|
|
#include <linux/workqueue.h>
|
|
|
#include <linux/prefetch.h>
|
|
|
+#include <linux/dma-mapping.h>
|
|
|
|
|
|
#include <net/checksum.h>
|
|
|
|
|
@@ -10522,17 +10523,17 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
|
|
|
}
|
|
|
|
|
|
/* Configure DMA attributes. */
|
|
|
- err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
|
|
|
+ err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
|
|
|
if (!err) {
|
|
|
pci_using_dac = 1;
|
|
|
- err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
|
|
|
+ err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
|
|
|
if (err < 0) {
|
|
|
printk(KERN_ERR PFX "Unable to obtain 64 bit DMA "
|
|
|
"for consistent allocations\n");
|
|
|
goto err_out_free_res;
|
|
|
}
|
|
|
} else {
|
|
|
- err = pci_set_dma_mask(pdev, 0xffffffffULL);
|
|
|
+ err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
|
|
if (err) {
|
|
|
printk(KERN_ERR PFX "No usable DMA configuration, "
|
|
|
"aborting.\n");
|