1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 16989ad2ca90..6fd09926181a 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -353,11 +353,12 @@ i40evf_map_vector_to_rxq(struct i40evf_adapter *adapter, int v_idx, int r_idx)
         rx_ring->vsi = &adapter->vsi;
         q_vector->rx.ring = rx_ring;
         q_vector->rx.count++;
-        q_vector->rx.latency_range = I40E_LOW_LATENCY;
-        q_vector->rx.itr = ITR_TO_REG(rx_ring->rx_itr_setting);
+        q_vector->rx.next_update = jiffies + 1;
+        q_vector->rx.target_itr = ITR_TO_REG(rx_ring->itr_setting);
         q_vector->ring_mask |= BIT(r_idx);
-        q_vector->itr_countdown = ITR_COUNTDOWN_START;
-        wr32(hw, I40E_VFINT_ITRN1(I40E_RX_ITR, v_idx - 1), q_vector->rx.itr);
+        wr32(hw, I40E_VFINT_ITRN1(I40E_RX_ITR, q_vector->reg_idx),
+             q_vector->rx.current_itr);
+        q_vector->rx.current_itr = q_vector->rx.target_itr;
 }
 
 /**
@@ -378,11 +379,12 @@ i40evf_map_vector_to_txq(struct i40evf_adapter *adapter, int v_idx, int t_idx)
         tx_ring->vsi = &adapter->vsi;
         q_vector->tx.ring = tx_ring;
         q_vector->tx.count++;
-        q_vector->tx.latency_range = I40E_LOW_LATENCY;
-        q_vector->tx.itr = ITR_TO_REG(tx_ring->tx_itr_setting);
-        q_vector->itr_countdown = ITR_COUNTDOWN_START;
+        q_vector->tx.next_update = jiffies + 1;
+        q_vector->tx.target_itr = ITR_TO_REG(tx_ring->itr_setting);
         q_vector->num_ringpairs++;
-        wr32(hw, I40E_VFINT_ITRN1(I40E_TX_ITR, v_idx - 1), q_vector->tx.itr);
+        wr32(hw, I40E_VFINT_ITRN1(I40E_TX_ITR, q_vector->reg_idx),
+             q_vector->tx.target_itr);
+        q_vector->tx.current_itr = q_vector->tx.target_itr;
 }
 
 /**
@@ -1169,7 +1171,7 @@ static int i40evf_alloc_queues(struct i40evf_adapter *adapter)
                 tx_ring->netdev = adapter->netdev;
                 tx_ring->dev = &adapter->pdev->dev;
                 tx_ring->count = adapter->tx_desc_count;
-                tx_ring->tx_itr_setting = I40E_ITR_TX_DEF;
+                tx_ring->itr_setting = I40E_ITR_TX_DEF;
                 if (adapter->flags & I40EVF_FLAG_WB_ON_ITR_CAPABLE)
                         tx_ring->flags |= I40E_TXR_FLAGS_WB_ON_ITR;
 
@@ -1178,7 +1180,7 @@ static int i40evf_alloc_queues(struct i40evf_adapter *adapter)
                 rx_ring->netdev = adapter->netdev;
                 rx_ring->dev = &adapter->pdev->dev;
                 rx_ring->count = adapter->rx_desc_count;
-                rx_ring->rx_itr_setting = I40E_ITR_RX_DEF;
+                rx_ring->itr_setting = I40E_ITR_RX_DEF;
         }
 
         adapter->num_active_queues = num_active_queues;