]> git.karo-electronics.de Git - linux-beck.git/commitdiff
e1000e: remove EEE module parameter
authorBruce Allan <bruce.w.allan@intel.com>
Tue, 29 Jun 2010 18:12:52 +0000 (18:12 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jun 2010 06:09:19 +0000 (23:09 -0700)
As requested by Dave Miller.  A follow-on set of patches will allow for
ethtool to enable/disable the feature instead.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/param.c

index 593251c78c6ff295261bee1a5577dd09080cb8bb..34aeec13bb168390f869cbb91b30a4c5655b6fa5 100644 (file)
@@ -161,15 +161,6 @@ E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lea
 E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
                           "the CRC");
 
-/*
- * Enable/disable EEE (a.k.a. IEEE802.3az)
- *
- * Valid Range: 0, 1
- *
- * Default Value: 1
- */
-E1000_PARAM(EEE, "Enable/disable on parts that support the feature");
-
 struct e1000_option {
        enum { enable_option, range_option, list_option } type;
        const char *name;
@@ -486,23 +477,4 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                        }
                }
        }
-       { /* EEE for parts supporting the feature */
-               static const struct e1000_option opt = {
-                       .type = enable_option,
-                       .name = "EEE Support",
-                       .err  = "defaulting to Enabled",
-                       .def  = OPTION_ENABLED
-               };
-
-               if (adapter->flags2 & FLAG2_HAS_EEE) {
-                       /* Currently only supported on 82579 */
-                       if (num_EEE > bd) {
-                               unsigned int eee = EEE[bd];
-                               e1000_validate_option(&eee, &opt, adapter);
-                               hw->dev_spec.ich8lan.eee_disable = !eee;
-                       } else {
-                               hw->dev_spec.ich8lan.eee_disable = !opt.def;
-                       }
-               }
-       }
 }