---

yaml --- r: 351413 b: refs/heads/master c: e3d14b0 h: refs/heads/master i: 351411: 94dc363 v: v3
git-mirror · Jan 16, 2013 · 3563f64 · 3563f64
1 parent d2ce25c
commit 3563f64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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);
 	}
 }