aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2012-05-11 04:32:34 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-07-17 05:46:26 -0400
commite2c28ce76001f01fefb255e0ce1fd6819a2ad1ea (patch)
tree80c83aa5a099783273f6fc5ec589113df689d02f
parent525a940c37c706155dc6726582d6430c148d9f8b (diff)
ixgbevf: Drop use of eitr_low and eitr_high for hard coded values
This patch drops the use of eitr_low and eitr_high as values being stored in the adapter structure. Since the values have no external way to be changed they might as well just be hard coded values and save us the space on the adapter structure. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf.h2
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c12
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
index 773dafa13ca5..c62caba7ec56 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
@@ -177,8 +177,6 @@ struct ixgbevf_adapter {
177 177
178 /* Interrupt Throttle Rate */ 178 /* Interrupt Throttle Rate */
179 u32 itr_setting; 179 u32 itr_setting;
180 u16 eitr_low;
181 u16 eitr_high;
182 180
183 /* TX */ 181 /* TX */
184 struct ixgbevf_ring *tx_ring; /* One per active queue */ 182 struct ixgbevf_ring *tx_ring; /* One per active queue */
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 2e85d7966564..75af1920b0f7 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -704,17 +704,17 @@ static u8 ixgbevf_update_itr(struct ixgbevf_adapter *adapter,
704 704
705 switch (itr_setting) { 705 switch (itr_setting) {
706 case lowest_latency: 706 case lowest_latency:
707 if (bytes_perint > adapter->eitr_low) 707 if (bytes_perint > 10)
708 retval = low_latency; 708 retval = low_latency;
709 break; 709 break;
710 case low_latency: 710 case low_latency:
711 if (bytes_perint > adapter->eitr_high) 711 if (bytes_perint > 20)
712 retval = bulk_latency; 712 retval = bulk_latency;
713 else if (bytes_perint <= adapter->eitr_low) 713 else if (bytes_perint <= 10)
714 retval = lowest_latency; 714 retval = lowest_latency;
715 break; 715 break;
716 case bulk_latency: 716 case bulk_latency:
717 if (bytes_perint <= adapter->eitr_high) 717 if (bytes_perint <= 20)
718 retval = low_latency; 718 retval = low_latency;
719 break; 719 break;
720 } 720 }
@@ -2069,10 +2069,6 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
2069 adapter->eitr_param = 20000; 2069 adapter->eitr_param = 20000;
2070 adapter->itr_setting = 1; 2070 adapter->itr_setting = 1;
2071 2071
2072 /* set defaults for eitr in MegaBytes */
2073 adapter->eitr_low = 10;
2074 adapter->eitr_high = 20;
2075
2076 /* set default ring sizes */ 2072 /* set default ring sizes */
2077 adapter->tx_ring_count = IXGBEVF_DEFAULT_TXD; 2073 adapter->tx_ring_count = IXGBEVF_DEFAULT_TXD;
2078 adapter->rx_ring_count = IXGBEVF_DEFAULT_RXD; 2074 adapter->rx_ring_count = IXGBEVF_DEFAULT_RXD;