aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ertman <davidx.m.ertman@intel.com>2014-02-25 19:02:24 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-03-08 02:06:41 -0500
commit5bb731760810b30d67096cbdded96addba4f1292 (patch)
tree9888e3c304ea137d2c0de50b2fa8ab6a958dc50a
parent74f350ee08e2ffa083204029018fce9941ba9bd5 (diff)
e1000e: Fix not generating an error on invalid load parameter
Valid values for InterruptThrottleRate are 10-100000, or one of 0, 1, 3, 4. '2' is not valid. This is a legacy from the branching from the e1000 driver code that e1000e was based from. Prior to this patch, if the e1000e driver was loaded with a forced invalid InterruptThrottleRate of '2', then no throttle rate would be set and no error message generated. Now, a message will be generated that an invalid value was used and the value for InterruptThrottleRate will be set to the default value. Signed-off-by: Dave Ertman <davidx.m.ertman@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/param.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 01797b73e20c..d0ac0f3249c8 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -374,6 +374,12 @@ void e1000e_check_options(struct e1000_adapter *adapter)
374 "%s set to dynamic mode\n", opt.name); 374 "%s set to dynamic mode\n", opt.name);
375 adapter->itr = 20000; 375 adapter->itr = 20000;
376 break; 376 break;
377 case 2:
378 dev_info(&adapter->pdev->dev,
379 "%s Invalid mode - setting default\n",
380 opt.name);
381 adapter->itr_setting = opt.def;
382 /* fall-through */
377 case 3: 383 case 3:
378 dev_info(&adapter->pdev->dev, 384 dev_info(&adapter->pdev->dev,
379 "%s set to dynamic conservative mode\n", 385 "%s set to dynamic conservative mode\n",