diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-12-05 01:26:51 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-01-16 03:49:47 -0500 |
commit | e3d14b08e80744958af920ab8bc8ee3866c3902b (patch) | |
tree | 22269cc96efc9e58dbd6c02e03c467a84d930a4b /drivers | |
parent | 3a3104e7d022ec24862448d167a21de46accf6e8 (diff) |
e1000e: cleanup code duplication
The removed code block is duplicated in e1000e_write_itr() so use that
instead.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 18790a608f4f..6aa9c5d31a48 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -2405,7 +2405,6 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter, | |||
2405 | 2405 | ||
2406 | static void e1000_set_itr(struct e1000_adapter *adapter) | 2406 | static void e1000_set_itr(struct e1000_adapter *adapter) |
2407 | { | 2407 | { |
2408 | struct e1000_hw *hw = &adapter->hw; | ||
2409 | u16 current_itr; | 2408 | u16 current_itr; |
2410 | u32 new_itr = adapter->itr; | 2409 | u32 new_itr = adapter->itr; |
2411 | 2410 | ||
@@ -2468,10 +2467,7 @@ set_itr_now: | |||
2468 | if (adapter->msix_entries) | 2467 | if (adapter->msix_entries) |
2469 | adapter->rx_ring->set_itr = 1; | 2468 | adapter->rx_ring->set_itr = 1; |
2470 | else | 2469 | else |
2471 | if (new_itr) | 2470 | e1000e_write_itr(adapter, new_itr); |
2472 | ew32(ITR, 1000000000 / (new_itr * 256)); | ||
2473 | else | ||
2474 | ew32(ITR, 0); | ||
2475 | } | 2471 | } |
2476 | } | 2472 | } |
2477 | 2473 | ||