UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

e1000e: Fix merge conflict (net->net-next) 

During merge of net to net-next the changes in patch:

e1000e: Fix default interrupt throttle rate not set in NIC HW

got munged in param.c of the e1000e driver.  This rectifies the
merge issues.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jeff Kirsher 2012-05-09 02:15:14 -07:00
parent 9bb862beb6
commit eeb0d0132d
1 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/net/ethernet/intel/e1000e/param.c
View File

@ -344,50 +344,16 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
if (num_InterruptThrottleRate > bd) { if (num_InterruptThrottleRate > bd) {
adapter->itr = InterruptThrottleRate[bd]; adapter->itr = InterruptThrottleRate[bd];
switch (adapter->itr) {
case 0: /*
e_info("%s turned off\n", opt.name); * Make sure a message is printed for non-special
break; * values. And in case of an invalid option, display
case 1: * warning, use default and go through itr/itr_setting
e_info("%s set to dynamic mode\n", opt.name); * adjustment logic below
adapter->itr_setting = adapter->itr; */
adapter->itr = 20000; if ((adapter->itr > 4) &&
break; e1000_validate_option(&adapter->itr, &opt, adapter))
case 3: adapter->itr = opt.def;
e_info("%s set to dynamic conservative mode\n",
opt.name);
adapter->itr_setting = adapter->itr;
adapter->itr = 20000;
break;
case 4:
e_info("%s set to simplified (2000-8000 ints) mode\n",
opt.name);
adapter->itr_setting = 4;
break;
default:
/*
* Save the setting, because the dynamic bits
* change itr.
*/
if (e1000_validate_option(&adapter->itr, &opt,
adapter) &&
(adapter->itr == 3)) {
/*
* In case of invalid user value,
* default to conservative mode.
*/
adapter->itr_setting = adapter->itr;
adapter->itr = 20000;
} else {
/*
* Clear the lower two bits because
* they are used as control.
*/
adapter->itr_setting =
adapter->itr & ~3;
}
break;
}
} else { } else {
/* /*
* If no option specified, use default value and go * If no option specified, use default value and go
@ -399,7 +365,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
* Make sure a message is printed for non-special * Make sure a message is printed for non-special
* default values * default values
*/ */
if (adapter->itr > 40) if (adapter->itr > 4)
e_info("%s set to default %d\n", opt.name, e_info("%s set to default %d\n", opt.name,
adapter->itr); adapter->itr);
} }