diff options
| author | Chris Boot <bootc@bootc.net> | 2012-04-24 07:24:52 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:54 -0700 |
| commit | 41cc15ce40dbe5cbc938f9e4acdf0fb0156fd374 (patch) | |
| tree | de0cb9746b3cba128b851a128675ed6bcaaf2fcd /drivers/net | |
| parent | cfa379de3ffabed3dd9715144804535484e51f4e (diff) | |
| download | kernel_samsung_smdk4412-41cc15ce40dbe5cbc938f9e4acdf0fb0156fd374.zip kernel_samsung_smdk4412-41cc15ce40dbe5cbc938f9e4acdf0fb0156fd374.tar.gz kernel_samsung_smdk4412-41cc15ce40dbe5cbc938f9e4acdf0fb0156fd374.tar.bz2 | |
e1000e: Disable ASPM L1 on 82574
commit d4a4206ebbaf48b55803a7eb34e330530d83a889 upstream.
ASPM on the 82574 causes trouble. Currently the driver disables L0s for
this NIC but only disables L1 if the MTU is >1500. This patch simply
causes L1 to be disabled regardless of the MTU setting.
Signed-off-by: Chris Boot <bootc@bootc.net>
Cc: "Wyborny, Carolyn" <carolyn.wyborny@intel.com>
Cc: Nix <nix@esperi.org.uk>
Link: https://lkml.org/lkml/2012/3/19/362
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000e/82571.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index 0d0ee55..8402d19 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c @@ -2088,7 +2088,8 @@ struct e1000_info e1000_82574_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .flags2 = FLAG2_CHECK_PHY_HANG - | FLAG2_DISABLE_ASPM_L0S, + | FLAG2_DISABLE_ASPM_L0S + | FLAG2_DISABLE_ASPM_L1, .pba = 32, .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, |