From f96ed4a28c90e866e66d4454523b90d0dcd91144 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Tue, 29 Jun 2010 18:13:13 +0000 Subject: [PATCH] --- yaml --- r: 203225 b: refs/heads/master c: 5a86f28f954c3841d3a6df4d07d2ed17088c3711 h: refs/heads/master i: 203223: 4a5ebc085e07a67a2842d4e58eac2a3f3f5fd292 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ich8lan.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 076384a8de69..5772eab2e4d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc40f57a76be05e6f17a6c83ec6c60e3fbcf4217 +refs/heads/master: 5a86f28f954c3841d3a6df4d07d2ed17088c3711 diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c index 6b5e108bb51f..63930d12711c 100644 --- a/trunk/drivers/net/e1000e/ich8lan.c +++ b/trunk/drivers/net/e1000e/ich8lan.c @@ -731,6 +731,10 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) (adapter->hw.phy.type == e1000_phy_igp_3)) adapter->flags |= FLAG_LSC_GIG_SPEED_DROP; + /* 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; }