From d65faed1cc385232e74f87ac61733299eb5a348a Mon Sep 17 00:00:00 2001
From: Nick Nunley <nicholasx.d.nunley@intel.com>
Date: Wed, 17 Feb 2010 01:03:19 +0000
Subject: [PATCH] --- yaml --- r: 184265 b: refs/heads/master c:
 abe1c3638ccf8b68536afb52b111f6ad46d1cf71 h: refs/heads/master i:   184263:
 4b087fb676f2fa16a2533ab7a9fff8dac63178ab v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/igb/igb_main.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61971ff431fb..0f5eab6cc0d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d0b0f693578109aff347e055d47f2797c802261
+refs/heads/master: abe1c3638ccf8b68536afb52b111f6ad46d1cf71
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index eb48e1a084dd..4ccc7fc70f53 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -3260,6 +3260,10 @@ static void igb_update_ring_itr(struct igb_q_vector *q_vector)
 	else
 		new_val = avg_wire_size / 2;
 
+	/* when in itr mode 3 do not exceed 20K ints/sec */
+	if (adapter->rx_itr_setting == 3 && new_val < 196)
+		new_val = 196;
+
 set_itr_val:
 	if (new_val != q_vector->itr_val) {
 		q_vector->itr_val = new_val;