aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 5ba91d7f7587..6a736dda3ee2 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13228,7 +13228,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
13228 * do DMA address check in tg3_start_xmit(). 13228 * do DMA address check in tg3_start_xmit().
13229 */ 13229 */
13230 if (tp->tg3_flags2 & TG3_FLG2_IS_5788) 13230 if (tp->tg3_flags2 & TG3_FLG2_IS_5788)
13231 persist_dma_mask = dma_mask = DMA_32BIT_MASK; 13231 persist_dma_mask = dma_mask = DMA_BIT_MASK(32);
13232 else if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG) { 13232 else if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG) {
13233 persist_dma_mask = dma_mask = DMA_BIT_MASK(40); 13233 persist_dma_mask = dma_mask = DMA_BIT_MASK(40);
13234#ifdef CONFIG_HIGHMEM 13234#ifdef CONFIG_HIGHMEM
@@ -13238,7 +13238,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
13238 persist_dma_mask = dma_mask = DMA_BIT_MASK(64); 13238 persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
13239 13239
13240 /* Configure DMA attributes. */ 13240 /* Configure DMA attributes. */
13241 if (dma_mask > DMA_32BIT_MASK) { 13241 if (dma_mask > DMA_BIT_MASK(32)) {
13242 err = pci_set_dma_mask(pdev, dma_mask); 13242 err = pci_set_dma_mask(pdev, dma_mask);
13243 if (!err) { 13243 if (!err) {
13244 dev->features |= NETIF_F_HIGHDMA; 13244 dev->features |= NETIF_F_HIGHDMA;
@@ -13251,8 +13251,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
13251 } 13251 }
13252 } 13252 }
13253 } 13253 }
13254 if (err || dma_mask == DMA_32BIT_MASK) { 13254 if (err || dma_mask == DMA_BIT_MASK(32)) {
13255 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 13255 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
13256 if (err) { 13256 if (err) {
13257 printk(KERN_ERR PFX "No usable DMA configuration, " 13257 printk(KERN_ERR PFX "No usable DMA configuration, "
13258 "aborting.\n"); 13258 "aborting.\n");
@@ -13393,7 +13393,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
13393 (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0); 13393 (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0);
13394 printk(KERN_INFO "%s: dma_rwctrl[%08x] dma_mask[%d-bit]\n", 13394 printk(KERN_INFO "%s: dma_rwctrl[%08x] dma_mask[%d-bit]\n",
13395 dev->name, tp->dma_rwctrl, 13395 dev->name, tp->dma_rwctrl,
13396 (pdev->dma_mask == DMA_32BIT_MASK) ? 32 : 13396 (pdev->dma_mask == DMA_BIT_MASK(32)) ? 32 :
13397 (((u64) pdev->dma_mask == DMA_BIT_MASK(40)) ? 40 : 64)); 13397 (((u64) pdev->dma_mask == DMA_BIT_MASK(40)) ? 40 : 64));
13398 13398
13399 return 0; 13399 return 0;