aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tg3.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b547233ad9f7..1828a6bf8458 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -37,6 +37,7 @@
37#include <linux/tcp.h> 37#include <linux/tcp.h>
38#include <linux/workqueue.h> 38#include <linux/workqueue.h>
39#include <linux/prefetch.h> 39#include <linux/prefetch.h>
40#include <linux/dma-mapping.h>
40 41
41#include <net/checksum.h> 42#include <net/checksum.h>
42 43
@@ -10522,17 +10523,17 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
10522 } 10523 }
10523 10524
10524 /* Configure DMA attributes. */ 10525 /* Configure DMA attributes. */
10525 err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); 10526 err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
10526 if (!err) { 10527 if (!err) {
10527 pci_using_dac = 1; 10528 pci_using_dac = 1;
10528 err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); 10529 err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
10529 if (err < 0) { 10530 if (err < 0) {
10530 printk(KERN_ERR PFX "Unable to obtain 64 bit DMA " 10531 printk(KERN_ERR PFX "Unable to obtain 64 bit DMA "
10531 "for consistent allocations\n"); 10532 "for consistent allocations\n");
10532 goto err_out_free_res; 10533 goto err_out_free_res;
10533 } 10534 }
10534 } else { 10535 } else {
10535 err = pci_set_dma_mask(pdev, 0xffffffffULL); 10536 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
10536 if (err) { 10537 if (err) {
10537 printk(KERN_ERR PFX "No usable DMA configuration, " 10538 printk(KERN_ERR PFX "No usable DMA configuration, "
10538 "aborting.\n"); 10539 "aborting.\n");