From 7cd58aec3bd4f5a735a84e39081df8c706e1ebf2 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Thu, 12 May 2005 22:19:39 -0400
Subject: [PATCH] --- yaml --- r: 1087 b: refs/heads/master c:
 8662d061719a202e8196a19c1043ce271318d31b h: refs/heads/master i:   1085:
 fbd3af3600f086ac1908f8aaffa647923abee0c2   1083:
 fc58187c6d7a5a2a5ce074da44a12159740d11c0   1079:
 9eaa8621f82d2cec2d1647f48fd2e9f1e2d101c4   1071:
 a79db11edd9c99a52371e25c47cd2a9cfacfd4da   1055:
 06ab91a2cefd0622091876eeb144aa4e7cfa2134   1023:
 4a33e997c4dc3cd7e340898bcda07aca1f94243d v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/8139cp.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7329ffbffc99..b85767e443aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5
+refs/heads/master: 8662d061719a202e8196a19c1043ce271318d31b
diff --git a/trunk/drivers/net/8139cp.c b/trunk/drivers/net/8139cp.c
index d639cb8dc461..ca4c9ac7e115 100644
--- a/trunk/drivers/net/8139cp.c
+++ b/trunk/drivers/net/8139cp.c
@@ -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");