diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2014-10-16 23:14:46 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-11-03 05:13:57 -0500 |
commit | a282babcfd922f27e59b7ce7d046a310123a8220 (patch) | |
tree | 43ab51aa493ce4d121255a3fb03330a24a23e7b3 /drivers/net | |
parent | 1ac1e7643ca68d86d3e1432e974294bf4038cb44 (diff) |
i40e: avoid disable of interrupt when changing ITR
The call to irq_dynamic_disable was turning off the interrupt completely
when trying to set ITR to 0 (for lowest moderation). Just remove the
call as setting the values to 0 later in this function will suffice.
Change-ID: I47caf1ecbe65653cf63ec833db93094cd83fd84d
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Patrick Lu <patrick.lu@intel.com>
Tested-By: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index 12adc08c54dc..b6e745f277cc 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c | |||
@@ -1574,7 +1574,6 @@ static int i40e_set_coalesce(struct net_device *netdev, | |||
1574 | vsi->rx_itr_setting = ec->rx_coalesce_usecs; | 1574 | vsi->rx_itr_setting = ec->rx_coalesce_usecs; |
1575 | } else if (ec->rx_coalesce_usecs == 0) { | 1575 | } else if (ec->rx_coalesce_usecs == 0) { |
1576 | vsi->rx_itr_setting = ec->rx_coalesce_usecs; | 1576 | vsi->rx_itr_setting = ec->rx_coalesce_usecs; |
1577 | i40e_irq_dynamic_disable(vsi, vector); | ||
1578 | if (ec->use_adaptive_rx_coalesce) | 1577 | if (ec->use_adaptive_rx_coalesce) |
1579 | netif_info(pf, drv, netdev, | 1578 | netif_info(pf, drv, netdev, |
1580 | "Rx-secs=0, need to disable adaptive-Rx for a complete disable\n"); | 1579 | "Rx-secs=0, need to disable adaptive-Rx for a complete disable\n"); |
@@ -1589,7 +1588,6 @@ static int i40e_set_coalesce(struct net_device *netdev, | |||
1589 | vsi->tx_itr_setting = ec->tx_coalesce_usecs; | 1588 | vsi->tx_itr_setting = ec->tx_coalesce_usecs; |
1590 | } else if (ec->tx_coalesce_usecs == 0) { | 1589 | } else if (ec->tx_coalesce_usecs == 0) { |
1591 | vsi->tx_itr_setting = ec->tx_coalesce_usecs; | 1590 | vsi->tx_itr_setting = ec->tx_coalesce_usecs; |
1592 | i40e_irq_dynamic_disable(vsi, vector); | ||
1593 | if (ec->use_adaptive_tx_coalesce) | 1591 | if (ec->use_adaptive_tx_coalesce) |
1594 | netif_info(pf, drv, netdev, | 1592 | netif_info(pf, drv, netdev, |
1595 | "Tx-secs=0, need to disable adaptive-Tx for a complete disable\n"); | 1593 | "Tx-secs=0, need to disable adaptive-Tx for a complete disable\n"); |