From 7a10ddefa4adc42dad1256bcc2cc65ad06015304 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 17 Aug 2012 06:17:57 +0000
Subject: [PATCH] --- yaml --- r: 327743 b: refs/heads/master c:
 06a402ef51b374f2308b0a6c790b301311df786f h: refs/heads/master i:   327741:
 811a55dd0ed4989ba6b824dfc89f3add3f4e6ff3   327739:
 51c3389d83467bd80bc409c9a1fa5e3650bec02e   327735:
 4adf6f2e3166bd5a2f568ab381041ee1f4ab6b1e   327727:
 12760ae8890e6b5c9e5a67c7bf448f413c536394   327711:
 47b832a235f4cc29f48269858730e3daa2b1ff3e   327679:
 9dd685fb495fdbf23aef974fab57f7f04898b12a v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/ethtool.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index da015d3c8bd0..7c69c51a7aea 100644
--- 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
index 2e76f06720fd..c11ac2756667 100644
--- 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;