aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 9c224eba057d..bb639a8794d4 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -42,6 +42,7 @@
42#include <linux/errno.h> 42#include <linux/errno.h>
43#include <linux/ioport.h> 43#include <linux/ioport.h>
44#include <linux/pci.h> 44#include <linux/pci.h>
45#include <linux/dma-mapping.h>
45#include <linux/kernel.h> 46#include <linux/kernel.h>
46#include <linux/netdevice.h> 47#include <linux/netdevice.h>
47#include <linux/etherdevice.h> 48#include <linux/etherdevice.h>
@@ -4593,19 +4594,19 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
4593 return ret; 4594 return ret;
4594 } 4595 }
4595 4596
4596 if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { 4597 if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
4597 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n"); 4598 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n");
4598 dma_flag = TRUE; 4599 dma_flag = TRUE;
4599 4600
4600 if (pci_set_consistent_dma_mask 4601 if (pci_set_consistent_dma_mask
4601 (pdev, 0xffffffffffffffffULL)) { 4602 (pdev, DMA_64BIT_MASK)) {
4602 DBG_PRINT(ERR_DBG, 4603 DBG_PRINT(ERR_DBG,
4603 "Unable to obtain 64bit DMA for \ 4604 "Unable to obtain 64bit DMA for \
4604 consistent allocations\n"); 4605 consistent allocations\n");
4605 pci_disable_device(pdev); 4606 pci_disable_device(pdev);
4606 return -ENOMEM; 4607 return -ENOMEM;
4607 } 4608 }
4608 } else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) { 4609 } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
4609 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n"); 4610 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n");
4610 } else { 4611 } else {
4611 pci_disable_device(pdev); 4612 pci_disable_device(pdev);