Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] drivers/net/tg3: Use the DMA_{32,64}BIT_MASK constants

Browse source 
This one from my DMA_{32,64}BIT_MASK series did not seem to make it
through to upstream.

Use the DMA_{32,64}BIT_MASK constants from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors
on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Tobias Klauser 2005-10-29 15:09:26 +02:00 committed by Jeff Garzik
parent 977e74b5f6
commit f9a5f7d3f3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/tg3.c
View file

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