The patch titled
e1000e: set InterruptThrottleRate to default when invalid value used
has been removed from the -mm tree. Its filename was
e1000e-set-interruptthrottlerate-to-default-when-invalid-value-used.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: e1000e: set InterruptThrottleRate to default when invalid value used
From: Bruce Allan <bruce.w.allan@xxxxxxxxx>
During module load, seting the InterruptThrottleRate parameter to an
invalid value would result in the itr/itr_setting pair being set to
unexpected values which would result in poor performance.
Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/e1000e/param.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff -puN drivers/net/e1000e/param.c~e1000e-set-interruptthrottlerate-to-default-when-invalid-value-used drivers/net/e1000e/param.c
--- a/drivers/net/e1000e/param.c~e1000e-set-interruptthrottlerate-to-default-when-invalid-value-used
+++ a/drivers/net/e1000e/param.c
@@ -327,11 +327,26 @@ void __devinit e1000e_check_options(stru
e1000_validate_option(&adapter->itr, &opt,
adapter);
/*
- * save the setting, because the dynamic bits
- * change itr. clear the lower two bits
- * because they are used as control
+ * Save the setting, because the dynamic bits
+ * change itr.
*/
- adapter->itr_setting = adapter->itr & ~3;
+ 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 {
_
Patches currently in -mm which might be from bruce.w.allan@xxxxxxxxx are
git-net.patch
e1000e-remove-inapplicable-test-for-ioport-checkpatch-fixes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
