aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2010-06-29 14:12:52 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-30 02:09:19 -0400
commitcc40f57a76be05e6f17a6c83ec6c60e3fbcf4217 (patch)
tree0976ab6e08e7ce29af0ac636cf9ebbdf84cf0e90 /drivers/net/e1000e
parent8eb64e6b856437318ac3de9c73789c9ab54b1589 (diff)
e1000e: remove EEE module parameter
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>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/param.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index 593251c78c6f..34aeec13bb16 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -161,15 +161,6 @@ E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lea
161E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \ 161E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
162 "the CRC"); 162 "the CRC");
163 163
164/*
165 * Enable/disable EEE (a.k.a. IEEE802.3az)
166 *
167 * Valid Range: 0, 1
168 *
169 * Default Value: 1
170 */
171E1000_PARAM(EEE, "Enable/disable on parts that support the feature");
172
173struct e1000_option { 164struct e1000_option {
174 enum { enable_option, range_option, list_option } type; 165 enum { enable_option, range_option, list_option } type;
175 const char *name; 166 const char *name;
@@ -486,23 +477,4 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
486 } 477 }
487 } 478 }
488 } 479 }
489 { /* EEE for parts supporting the feature */
490 static const struct e1000_option opt = {
491 .type = enable_option,
492 .name = "EEE Support",
493 .err = "defaulting to Enabled",
494 .def = OPTION_ENABLED
495 };
496
497 if (adapter->flags2 & FLAG2_HAS_EEE) {
498 /* Currently only supported on 82579 */
499 if (num_EEE > bd) {
500 unsigned int eee = EEE[bd];
501 e1000_validate_option(&eee, &opt, adapter);
502 hw->dev_spec.ich8lan.eee_disable = !eee;
503 } else {
504 hw->dev_spec.ich8lan.eee_disable = !opt.def;
505 }
506 }
507 }
508} 480}