e1000e: Fix not generating an error on invalid load parameter
authorDavid Ertman <davidx.m.ertman@intel.com>
Wed, 26 Feb 2014 00:02:24 +0000 (00:02 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 8 Mar 2014 07:06:41 +0000 (23:06 -0800)
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>
drivers/net/ethernet/intel/e1000e/param.c

index 01797b73e20ce03b2b8b6ae29191e2bdc803ce4d..d0ac0f3249c886415d308c4a0cd376feda3d44db 100644 (file)
@@ -374,6 +374,12 @@ void e1000e_check_options(struct e1000_adapter *adapter)
                                 "%s set to dynamic mode\n", opt.name);
                        adapter->itr = 20000;
                        break;
+               case 2:
+                       dev_info(&adapter->pdev->dev,
+                                "%s Invalid mode - setting default\n",
+                                opt.name);
+                       adapter->itr_setting = opt.def;
+                       /* fall-through */
                case 3:
                        dev_info(&adapter->pdev->dev,
                                 "%s set to dynamic conservative mode\n",