diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 126735ca6d7f..9ef128ae6458 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1643,7 +1643,7 @@ static void ixgbe_configure_tx(struct ixgbe_adapter *adapter) | |||
1643 | tdba = ring->dma; | 1643 | tdba = ring->dma; |
1644 | tdlen = ring->count * sizeof(union ixgbe_adv_tx_desc); | 1644 | tdlen = ring->count * sizeof(union ixgbe_adv_tx_desc); |
1645 | IXGBE_WRITE_REG(hw, IXGBE_TDBAL(j), | 1645 | IXGBE_WRITE_REG(hw, IXGBE_TDBAL(j), |
1646 | (tdba & DMA_32BIT_MASK)); | 1646 | (tdba & DMA_BIT_MASK(32))); |
1647 | IXGBE_WRITE_REG(hw, IXGBE_TDBAH(j), (tdba >> 32)); | 1647 | IXGBE_WRITE_REG(hw, IXGBE_TDBAH(j), (tdba >> 32)); |
1648 | IXGBE_WRITE_REG(hw, IXGBE_TDLEN(j), tdlen); | 1648 | IXGBE_WRITE_REG(hw, IXGBE_TDLEN(j), tdlen); |
1649 | IXGBE_WRITE_REG(hw, IXGBE_TDH(j), 0); | 1649 | IXGBE_WRITE_REG(hw, IXGBE_TDH(j), 0); |
@@ -1782,7 +1782,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) | |||
1782 | for (i = 0; i < adapter->num_rx_queues; i++) { | 1782 | for (i = 0; i < adapter->num_rx_queues; i++) { |
1783 | rdba = adapter->rx_ring[i].dma; | 1783 | rdba = adapter->rx_ring[i].dma; |
1784 | j = adapter->rx_ring[i].reg_idx; | 1784 | j = adapter->rx_ring[i].reg_idx; |
1785 | IXGBE_WRITE_REG(hw, IXGBE_RDBAL(j), (rdba & DMA_32BIT_MASK)); | 1785 | IXGBE_WRITE_REG(hw, IXGBE_RDBAL(j), (rdba & DMA_BIT_MASK(32))); |
1786 | IXGBE_WRITE_REG(hw, IXGBE_RDBAH(j), (rdba >> 32)); | 1786 | IXGBE_WRITE_REG(hw, IXGBE_RDBAH(j), (rdba >> 32)); |
1787 | IXGBE_WRITE_REG(hw, IXGBE_RDLEN(j), rdlen); | 1787 | IXGBE_WRITE_REG(hw, IXGBE_RDLEN(j), rdlen); |
1788 | IXGBE_WRITE_REG(hw, IXGBE_RDH(j), 0); | 1788 | IXGBE_WRITE_REG(hw, IXGBE_RDH(j), 0); |
@@ -4513,9 +4513,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
4513 | !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) { | 4513 | !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) { |
4514 | pci_using_dac = 1; | 4514 | pci_using_dac = 1; |
4515 | } else { | 4515 | } else { |
4516 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 4516 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
4517 | if (err) { | 4517 | if (err) { |
4518 | err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 4518 | err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
4519 | if (err) { | 4519 | if (err) { |
4520 | dev_err(&pdev->dev, "No usable DMA " | 4520 | dev_err(&pdev->dev, "No usable DMA " |
4521 | "configuration, aborting\n"); | 4521 | "configuration, aborting\n"); |