diff options
-rw-r--r-- | drivers/net/igb/igb_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 78558f840fd2..2cb267fc9c7e 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -3670,11 +3670,11 @@ static void igb_update_rx_dca(struct igb_ring *rx_ring) | |||
3670 | dca_rxctrl = rd32(E1000_DCA_RXCTRL(q)); | 3670 | dca_rxctrl = rd32(E1000_DCA_RXCTRL(q)); |
3671 | if (hw->mac.type == e1000_82576) { | 3671 | if (hw->mac.type == e1000_82576) { |
3672 | dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK_82576; | 3672 | dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK_82576; |
3673 | dca_rxctrl |= dca_get_tag(cpu) << | 3673 | dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) << |
3674 | E1000_DCA_RXCTRL_CPUID_SHIFT; | 3674 | E1000_DCA_RXCTRL_CPUID_SHIFT; |
3675 | } else { | 3675 | } else { |
3676 | dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK; | 3676 | dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK; |
3677 | dca_rxctrl |= dca_get_tag(cpu); | 3677 | dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu); |
3678 | } | 3678 | } |
3679 | dca_rxctrl |= E1000_DCA_RXCTRL_DESC_DCA_EN; | 3679 | dca_rxctrl |= E1000_DCA_RXCTRL_DESC_DCA_EN; |
3680 | dca_rxctrl |= E1000_DCA_RXCTRL_HEAD_DCA_EN; | 3680 | dca_rxctrl |= E1000_DCA_RXCTRL_HEAD_DCA_EN; |
@@ -3697,11 +3697,11 @@ static void igb_update_tx_dca(struct igb_ring *tx_ring) | |||
3697 | dca_txctrl = rd32(E1000_DCA_TXCTRL(q)); | 3697 | dca_txctrl = rd32(E1000_DCA_TXCTRL(q)); |
3698 | if (hw->mac.type == e1000_82576) { | 3698 | if (hw->mac.type == e1000_82576) { |
3699 | dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK_82576; | 3699 | dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK_82576; |
3700 | dca_txctrl |= dca_get_tag(cpu) << | 3700 | dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) << |
3701 | E1000_DCA_TXCTRL_CPUID_SHIFT; | 3701 | E1000_DCA_TXCTRL_CPUID_SHIFT; |
3702 | } else { | 3702 | } else { |
3703 | dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK; | 3703 | dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK; |
3704 | dca_txctrl |= dca_get_tag(cpu); | 3704 | dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu); |
3705 | } | 3705 | } |
3706 | dca_txctrl |= E1000_DCA_TXCTRL_DESC_DCA_EN; | 3706 | dca_txctrl |= E1000_DCA_TXCTRL_DESC_DCA_EN; |
3707 | wr32(E1000_DCA_TXCTRL(q), dca_txctrl); | 3707 | wr32(E1000_DCA_TXCTRL(q), dca_txctrl); |