From 0ce3c4133e5f2e8431a135f1ea814a78241b9d89 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Tue, 12 Feb 2013 02:31:01 +0000
Subject: [PATCH] --- yaml --- r: 369301 b: refs/heads/master c:
 4e22766758cb8c971c971f3d335b974aaeb235fa h: refs/heads/master i:   369299:
 2ddf5c75734e7b8f68c33f80abf0500280d1512a v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/ethernet/intel/igb/igb_main.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3130c3b850a1..dffa790a7d1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b646c22edef1c350d26237a6f60d3a890ceedf6e
+refs/heads/master: 4e22766758cb8c971c971f3d335b974aaeb235fa
diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c
index d27eb4ed7a09..d838ab1ea96f 100644
--- a/trunk/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/trunk/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1179,6 +1179,17 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
 	/* initialize pointer to rings */
 	ring = q_vector->ring;
 
+	/* intialize ITR */
+	if (rxr_count) {
+		/* rx or rx/tx vector */
+		if (!adapter->rx_itr_setting || adapter->rx_itr_setting > 3)
+			q_vector->itr_val = adapter->rx_itr_setting;
+	} else {
+		/* tx only vector */
+		if (!adapter->tx_itr_setting || adapter->tx_itr_setting > 3)
+			q_vector->itr_val = adapter->tx_itr_setting;
+	}
+
 	if (txr_count) {
 		/* assign generic ring traits */
 		ring->dev = &adapter->pdev->dev;