Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc40f57a authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8eb64e6b

drivers/net/e1000e/param.c

+0 −28
Original line number Diff line number Diff line
@@ -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;

			}

		}

	}

}