diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/forcedeth.c | 4 | ||||
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 663a7b3261ee..d37465020bcc 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -5632,12 +5632,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5632 | np->desc_ver = DESC_VER_3; | 5632 | np->desc_ver = DESC_VER_3; |
5633 | np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; | 5633 | np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; |
5634 | if (dma_64bit) { | 5634 | if (dma_64bit) { |
5635 | if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) | 5635 | if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39))) |
5636 | dev_printk(KERN_INFO, &pci_dev->dev, | 5636 | dev_printk(KERN_INFO, &pci_dev->dev, |
5637 | "64-bit DMA failed, using 32-bit addressing\n"); | 5637 | "64-bit DMA failed, using 32-bit addressing\n"); |
5638 | else | 5638 | else |
5639 | dev->features |= NETIF_F_HIGHDMA; | 5639 | dev->features |= NETIF_F_HIGHDMA; |
5640 | if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) { | 5640 | if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) { |
5641 | dev_printk(KERN_INFO, &pci_dev->dev, | 5641 | dev_printk(KERN_INFO, &pci_dev->dev, |
5642 | "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); | 5642 | "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); |
5643 | } | 5643 | } |
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 1af47257ba82..aef77289bd34 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -207,19 +207,19 @@ static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id) | |||
207 | 207 | ||
208 | adapter->pci_using_dac = 0; | 208 | adapter->pci_using_dac = 0; |
209 | 209 | ||
210 | mask = DMA_32BIT_MASK; | 210 | mask = DMA_BIT_MASK(32); |
211 | /* | 211 | /* |
212 | * Consistent DMA mask is set to 32 bit because it cannot be set to | 212 | * Consistent DMA mask is set to 32 bit because it cannot be set to |
213 | * 35 bits. For P3 also leave it at 32 bits for now. Only the rings | 213 | * 35 bits. For P3 also leave it at 32 bits for now. Only the rings |
214 | * come off this pool. | 214 | * come off this pool. |
215 | */ | 215 | */ |
216 | cmask = DMA_32BIT_MASK; | 216 | cmask = DMA_BIT_MASK(32); |
217 | 217 | ||
218 | #ifndef CONFIG_IA64 | 218 | #ifndef CONFIG_IA64 |
219 | if (revision_id >= NX_P3_B0) | 219 | if (revision_id >= NX_P3_B0) |
220 | mask = DMA_39BIT_MASK; | 220 | mask = DMA_BIT_MASK(39); |
221 | else if (revision_id == NX_P2_C1) | 221 | else if (revision_id == NX_P2_C1) |
222 | mask = DMA_35BIT_MASK; | 222 | mask = DMA_BIT_MASK(35); |
223 | #endif | 223 | #endif |
224 | if (pci_set_dma_mask(pdev, mask) == 0 && | 224 | if (pci_set_dma_mask(pdev, mask) == 0 && |
225 | pci_set_consistent_dma_mask(pdev, cmask) == 0) { | 225 | pci_set_consistent_dma_mask(pdev, cmask) == 0) { |