aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4a61160052a3..409b58cad0e5 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2203,7 +2203,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
2203 /* Setup the HW Tx Head and Tail descriptor pointers */ 2203 /* Setup the HW Tx Head and Tail descriptor pointers */
2204 tdba = tx_ring->dma; 2204 tdba = tx_ring->dma;
2205 tdlen = tx_ring->count * sizeof(struct e1000_tx_desc); 2205 tdlen = tx_ring->count * sizeof(struct e1000_tx_desc);
2206 ew32(TDBAL, (tdba & DMA_32BIT_MASK)); 2206 ew32(TDBAL, (tdba & DMA_BIT_MASK(32)));
2207 ew32(TDBAH, (tdba >> 32)); 2207 ew32(TDBAH, (tdba >> 32));
2208 ew32(TDLEN, tdlen); 2208 ew32(TDLEN, tdlen);
2209 ew32(TDH, 0); 2209 ew32(TDH, 0);
@@ -2459,7 +2459,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
2459 * the Base and Length of the Rx Descriptor Ring 2459 * the Base and Length of the Rx Descriptor Ring
2460 */ 2460 */
2461 rdba = rx_ring->dma; 2461 rdba = rx_ring->dma;
2462 ew32(RDBAL, (rdba & DMA_32BIT_MASK)); 2462 ew32(RDBAL, (rdba & DMA_BIT_MASK(32)));
2463 ew32(RDBAH, (rdba >> 32)); 2463 ew32(RDBAH, (rdba >> 32));
2464 ew32(RDLEN, rdlen); 2464 ew32(RDLEN, rdlen);
2465 ew32(RDH, 0); 2465 ew32(RDH, 0);
@@ -4769,10 +4769,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4769 if (!err) 4769 if (!err)
4770 pci_using_dac = 1; 4770 pci_using_dac = 1;
4771 } else { 4771 } else {
4772 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 4772 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
4773 if (err) { 4773 if (err) {
4774 err = pci_set_consistent_dma_mask(pdev, 4774 err = pci_set_consistent_dma_mask(pdev,
4775 DMA_32BIT_MASK); 4775 DMA_BIT_MASK(32));
4776 if (err) { 4776 if (err) {
4777 dev_err(&pdev->dev, "No usable DMA " 4777 dev_err(&pdev->dev, "No usable DMA "
4778 "configuration, aborting\n"); 4778 "configuration, aborting\n");