---

yaml --- r: 327743 b: refs/heads/master c: 06a402e h: refs/heads/master i: 327741: 811a55d 327739: 51c3389 327735: 4adf6f2 327727: 12760ae 327711: 47b832a 327679: 9dd685f v: v3
git-mirror · Aug 31, 2012 · 7a10dde · 7a10dde
1 parent 71f81e3
commit 7a10dde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc76329d4a788b1c5f2de7208b2fae4e9204223c
+refs/heads/master: 06a402ef51b374f2308b0a6c790b301311df786f
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ethtool.c b/trunk/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1942,7 +1942,8 @@ static int e1000_set_coalesce(struct net_device *netdev,
 		return -EINVAL;
 
 	if (ec->rx_coalesce_usecs == 4) {
-		adapter->itr = adapter->itr_setting = 4;
+		adapter->itr_setting = 4;
+		adapter->itr = adapter->itr_setting;
 	} else if (ec->rx_coalesce_usecs <= 3) {
 		adapter->itr = 20000;
 		adapter->itr_setting = ec->rx_coalesce_usecs;