summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-03-06 09:02:57 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-03-28 00:12:35 -0700
commit1fc06b0aaa66740181b0cbaed6ef514a50dc6171 (patch)
tree722705b5d17257ea468c8a0fb1ab5e708ebb3e60
parentd495bcb84d2c3abb5ad5e43cfeea0e305ceffb30 (diff)
downloadblackbird-op-linux-1fc06b0aaa66740181b0cbaed6ef514a50dc6171.tar.gz
blackbird-op-linux-1fc06b0aaa66740181b0cbaed6ef514a50dc6171.zip
e1000e: enable EEE by default
Now that IEEE802.3az-2010 Energy Efficient Ethernet has been approved as standard (September 2010) and the driver can enable and disable it via ethtool, enable the feature by default on parts which support it. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 174507ccd7d7..56c4935b2578 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1034,10 +1034,6 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
adapter->flags2 |= FLAG2_PCIM2PCI_ARBITER_WA;
- /* Disable EEE by default until IEEE802.3az spec is finalized */
- if (adapter->flags2 & FLAG2_HAS_EEE)
- adapter->hw.dev_spec.ich8lan.eee_disable = true;
-
return 0;
}
OpenPOWER on IntegriCloud