igb: switch to new dca API

With the new DCA API, the driver should use dca3_get_tag() instead of
the obsolete dca_get_tag().

Signed-off-by: Maciej Sosnowski < maciej.sosnowski@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 78558f840fd24b79bb1c947e7a89b8ec56ff1da9..2cb267fc9c7e3d795dcc5dac3c9ef02b40d5d13a 100644 (file)
--- 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)
                dca_rxctrl = rd32(E1000_DCA_RXCTRL(q));
                if (hw->mac.type == e1000_82576) {
                        dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK_82576;
-                       dca_rxctrl |= dca_get_tag(cpu) <<
+                       dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) <<
                                      E1000_DCA_RXCTRL_CPUID_SHIFT;
                } else {
                        dca_rxctrl &= ~E1000_DCA_RXCTRL_CPUID_MASK;
-                       dca_rxctrl |= dca_get_tag(cpu);
+                       dca_rxctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
                }
                dca_rxctrl |= E1000_DCA_RXCTRL_DESC_DCA_EN;
                dca_rxctrl |= E1000_DCA_RXCTRL_HEAD_DCA_EN;
@@ -3697,11 +3697,11 @@ static void igb_update_tx_dca(struct igb_ring *tx_ring)
                dca_txctrl = rd32(E1000_DCA_TXCTRL(q));
                if (hw->mac.type == e1000_82576) {
                        dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK_82576;
-                       dca_txctrl |= dca_get_tag(cpu) <<
+                       dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu) <<
                                      E1000_DCA_TXCTRL_CPUID_SHIFT;
                } else {
                        dca_txctrl &= ~E1000_DCA_TXCTRL_CPUID_MASK;
-                       dca_txctrl |= dca_get_tag(cpu);
+                       dca_txctrl |= dca3_get_tag(&adapter->pdev->dev, cpu);
                }
                dca_txctrl |= E1000_DCA_TXCTRL_DESC_DCA_EN;
                wr32(E1000_DCA_TXCTRL(q), dca_txctrl);