diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-06-29 20:12:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-30 08:09:19 +0200 |
| commit | cc40f57a76be05e6f17a6c83ec6c60e3fbcf4217 (patch) | |
| tree | 0976ab6e08e7ce29af0ac636cf9ebbdf84cf0e90 /drivers/net/e1000e | |
| parent | e1000e: suppress compile warnings on certain archs (diff) | |
| download | linux-cc40f57a76be05e6f17a6c83ec6c60e3fbcf4217.tar.xz linux-cc40f57a76be05e6f17a6c83ec6c60e3fbcf4217.zip | |
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.c | 28 |
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 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; - } - } - } } |