11 files changed, 27 insertions, 16 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 6eea3a8accb7..dbecc6bf7851 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -58,6 +58,7 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -1167,9 +1168,9 @@ static int __devinit ace_init(struct net_device *dev)
         /*
          * Configure DMA attributes.
          */
-        if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 ap->pci_using_dac = 1;
-        } else if (!pci_set_dma_mask(pdev, 0xffffffffULL)) {
+        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 ap->pci_using_dac = 0;
         } else {
                 ecode = -ENODEV;
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 4a47df5a9ff9..cfaa6b2bf345 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -143,6 +143,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/mii.h>
@@ -2286,7 +2287,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 goto err_out_disable_pdev;
         }
 
-        if((err = pci_set_dma_mask(pdev, 0xFFFFFFFFULL))) {
+        if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
                 DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n");
                 goto err_out_free_res;
         }
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index c9d1a86d9594..cf0ac6fda1a1 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -106,6 +106,7 @@
 #include <linux/interrupt.h>
 #include <linux/eisa.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -557,7 +558,7 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
                          * Also, we can have EISA Busmaster cards (not tested),
                          * so beware !!! - Jean II */
                         if((bus == HP100_BUS_PCI) &&
-                           (pci_set_dma_mask(pci_dev, 0xffffffff))) {
+                           (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK))) {
                                 /* Gracefully fallback to shared memory */
                                 goto busmasterfail;
                         }
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index c336b46bd332..cc7965271778 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -101,6 +101,7 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
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 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -4593,19 +4594,19 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 return ret;
         }
 
-        if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n");
                 dma_flag = TRUE;
 
                 if (pci_set_consistent_dma_mask
-                    (pdev, 0xffffffffffffffffULL)) {
+                    (pdev, DMA_64BIT_MASK)) {
                         DBG_PRINT(ERR_DBG,
                                   "Unable to obtain 64bit DMA for \
                                         consistent allocations\n");
                         pci_disable_device(pdev);
                         return -ENOMEM;
                 }
-        } else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) {
+        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n");
         } else {
                 pci_disable_device(pdev);
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 1ccb2989001c..82570ec44d8e 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -112,6 +112,7 @@
 #include        <linux/moduleparam.h>
 #include        <linux/init.h>
 #include        <linux/proc_fs.h>
+#include        <linux/dma-mapping.h>
 
 #include        "h/skdrv1st.h"
 #include        "h/skdrv2nd.h"
@@ -4912,8 +4913,8 @@ static int __devinit skge_probe_one(struct pci_dev *pdev,
                 goto out;
  
         /* Configure DMA attributes. */
-        if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) &&
-            pci_set_dma_mask(pdev, (u64) 0xffffffff))
+        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) &&
+            pci_set_dma_mask(pdev, DMA_32BIT_MASK))
                 goto out_disable_device;
 
 
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 5cd50fd53c12..1f5655655c40 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -44,6 +44,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -2989,10 +2990,10 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
          */
         if (pdev->vendor == PCI_VENDOR_ID_SUN &&
             pdev->device == PCI_DEVICE_ID_SUN_GEM &&
-            !pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) {
+            !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
                 pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, (u64) 0xffffffff);
+                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (err) {
                         printk(KERN_ERR PFX "No usable DMA configuration, "
                                "aborting.\n");
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index cf31c0629852..942fae0f2130 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -171,6 +171,7 @@
 #include <linux/ioport.h>
 #include <linux/eisa.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/delay.h>
@@ -566,7 +567,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
                 priv->adapter = &board_info[ent->driver_data];
 
-                rc = pci_set_dma_mask(pdev, 0xFFFFFFFF);
+                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (rc) {
                         printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n");
                         goto err_out_free_dev;
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 99e0b03b69a8..6e5ade99a38f 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -118,6 +118,7 @@
 #include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 #include <linux/version.h>
 #include <linux/bitops.h>
@@ -257,7 +258,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
 #endif
 #endif
 
-        rc = pci_set_dma_mask(pdev, 0xFFFFFFFFULL);
+        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (rc) {
                 printk(KERN_ERR "%s: No suitable PCI mapping available.\n",
                                 dev->name);
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 7b57d552094a..6200cfc4244e 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -186,6 +186,7 @@ static const int multicast_filter_limit = 32;
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
@@ -740,7 +741,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
                 goto err_out;
 
         /* this should always be supported */
-        rc = pci_set_dma_mask(pdev, 0xffffffff);
+        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (rc) {
                 printk(KERN_ERR "32-bit PCI DMA addresses not supported by "
                        "the card!?\n");
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 1e7b47704ad9..9c1e10602f2b 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -26,6 +26,7 @@
 #include <linux/netdevice.h>
 #include <linux/hdlc.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 
@@ -624,8 +625,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
         /* FIXME when PCI/DMA subsystems are fixed.
            We set both dma_mask and consistent_dma_mask back to 32 bits
            to indicate the card can do 32-bit DMA addressing */
-        if (pci_set_consistent_dma_mask(pdev, 0xFFFFFFFF) ||
-            pci_set_dma_mask(pdev, 0xFFFFFFFF)) {
+        if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) ||
+            pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_ERR "wanXL: No usable DMA configuration\n");
                 wanxl_pci_remove_one(pdev);
                 return -EIO;