From 3563f64adbdf5492ddcf1df09b9c011047531d73 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 5 Dec 2012 06:26:51 +0000 Subject: [PATCH] --- yaml --- r: 351413 b: refs/heads/master c: e3d14b08e80744958af920ab8bc8ee3866c3902b h: refs/heads/master i: 351411: 94dc3630c4fd68957099b605121f4f075015a752 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/netdev.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ecc094934ea9..6ecefa8e76ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a3104e7d022ec24862448d167a21de46accf6e8 +refs/heads/master: e3d14b08e80744958af920ab8bc8ee3866c3902b diff --git a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c index 18790a608f4f..6aa9c5d31a48 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/netdev.c @@ -2405,7 +2405,6 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter, static void e1000_set_itr(struct e1000_adapter *adapter) { - struct e1000_hw *hw = &adapter->hw; u16 current_itr; u32 new_itr = adapter->itr; @@ -2468,10 +2467,7 @@ static void e1000_set_itr(struct e1000_adapter *adapter) if (adapter->msix_entries) adapter->rx_ring->set_itr = 1; else - if (new_itr) - ew32(ITR, 1000000000 / (new_itr * 256)); - else - ew32(ITR, 0); + e1000e_write_itr(adapter, new_itr); } }