Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Tobias Klauser and committed by
Jeff Garzik
f9a5f7d3 977e74b5

+4 -3
+4 -3
drivers/net/tg3.c
··· 37 37 #include <linux/tcp.h> 38 38 #include <linux/workqueue.h> 39 39 #include <linux/prefetch.h> 40 + #include <linux/dma-mapping.h> 40 41 41 42 #include <net/checksum.h> 42 43 ··· 10523 10522 } 10524 10523 10525 10524 /* Configure DMA attributes. */ 10526 - err = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); 10525 + err = pci_set_dma_mask(pdev, DMA_64BIT_MASK); 10527 10526 if (!err) { 10528 10527 pci_using_dac = 1; 10529 - err = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); 10528 + err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); 10530 10529 if (err < 0) { 10531 10530 printk(KERN_ERR PFX "Unable to obtain 64 bit DMA " 10532 10531 "for consistent allocations\n"); 10533 10532 goto err_out_free_res; 10534 10533 } 10535 10534 } else { 10536 - err = pci_set_dma_mask(pdev, 0xffffffffULL); 10535 + err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 10537 10536 if (err) { 10538 10537 printk(KERN_ERR PFX "No usable DMA configuration, " 10539 10538 "aborting.\n");