From 9d548986d4f8c5978793a41b80a42544687e0666 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 11 May 2012 08:32:34 +0000
Subject: [PATCH] --- yaml --- r: 315423 b: refs/heads/master c:
 e2c28ce76001f01fefb255e0ce1fd6819a2ad1ea h: refs/heads/master i:   315421:
 6b71272012e4e499e9c0e94615241e5a5d677cc7   315419:
 79bab6c1a096beadb538da86565e5376e59cb44e   315415:
 4d93653483b5c77f108ca12a316bdbfb144bce48   315407:
 6411a11ec1809ba3cabe8cc0f6a078cad1035a8c   315391:
 759ec0d58a0b327959a09290fe1a308eaff7007d v: v3

---
 [refs]                                               |  2 +-
 trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h   |  2 --
 .../net/ethernet/intel/ixgbevf/ixgbevf_main.c        | 12 ++++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 032a4641c734..b11f2661e535 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 525a940c37c706155dc6726582d6430c148d9f8b
+refs/heads/master: e2c28ce76001f01fefb255e0ce1fd6819a2ad1ea
diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 773dafa13ca5..c62caba7ec56 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -177,8 +177,6 @@ struct ixgbevf_adapter {
 
 	/* Interrupt Throttle Rate */
 	u32 itr_setting;
-	u16 eitr_low;
-	u16 eitr_high;
 
 	/* TX */
 	struct ixgbevf_ring *tx_ring;	/* One per active queue */
diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 2e85d7966564..75af1920b0f7 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -704,17 +704,17 @@ static u8 ixgbevf_update_itr(struct ixgbevf_adapter *adapter,
 
 	switch (itr_setting) {
 	case lowest_latency:
-		if (bytes_perint > adapter->eitr_low)
+		if (bytes_perint > 10)
 			retval = low_latency;
 		break;
 	case low_latency:
-		if (bytes_perint > adapter->eitr_high)
+		if (bytes_perint > 20)
 			retval = bulk_latency;
-		else if (bytes_perint <= adapter->eitr_low)
+		else if (bytes_perint <= 10)
 			retval = lowest_latency;
 		break;
 	case bulk_latency:
-		if (bytes_perint <= adapter->eitr_high)
+		if (bytes_perint <= 20)
 			retval = low_latency;
 		break;
 	}
@@ -2069,10 +2069,6 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
 	adapter->eitr_param = 20000;
 	adapter->itr_setting = 1;
 
-	/* set defaults for eitr in MegaBytes */
-	adapter->eitr_low = 10;
-	adapter->eitr_high = 20;
-
 	/* set default ring sizes */
 	adapter->tx_ring_count = IXGBEVF_DEFAULT_TXD;
 	adapter->rx_ring_count = IXGBEVF_DEFAULT_RXD;