summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2017-12-29 16:49:28 +0300
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-02-12 21:27:12 +0300
commit40588ca6513729e4de60e49896aab0a7ee09df19 (patch)
treeda9662f916d02d86505e84a19a24928caa80c5e7 /drivers/net/ethernet/intel/i40evf/i40e_txrx.c
parent11a350c965cc5ac2f5d0ed1fb336735a0c1a6344 (diff)
downloadlinux-40588ca6513729e4de60e49896aab0a7ee09df19.tar.xz
i40e/i40evf: Only track one ITR setting per ring instead of Tx/Rx
The rings are already split out into Tx and Rx rings so it doesn't make sense to have any single ring store both a Tx and Rx itr_setting value. Since that is the case drop the pair in favor of storing just a single ITR value. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40e_txrx.c')
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40e_txrx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 464200f48d91..291130af2985 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1475,14 +1475,14 @@ static inline int get_rx_itr(struct i40e_vsi *vsi, int idx)
{
struct i40evf_adapter *adapter = vsi->back;
- return adapter->rx_rings[idx].rx_itr_setting;
+ return adapter->rx_rings[idx].itr_setting;
}
static inline int get_tx_itr(struct i40e_vsi *vsi, int idx)
{
struct i40evf_adapter *adapter = vsi->back;
- return adapter->tx_rings[idx].tx_itr_setting;
+ return adapter->tx_rings[idx].itr_setting;
}
/**
@@ -1503,7 +1503,7 @@ static inline void i40e_update_enable_itr(struct i40e_vsi *vsi,
/* avoid dynamic calculation if in countdown mode OR if
* all dynamic is disabled
*/
- rxval = txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);
+ txval = i40e_buildreg_itr(I40E_ITR_NONE, 0);
rx_itr_setting = get_rx_itr(vsi, idx);
tx_itr_setting = get_tx_itr(vsi, idx);