diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-08-04 16:33:37 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 01:55:50 -0400 |
commit | f71eb1a24a8cdde8d388c8f93e935aa7ac491047 (patch) | |
tree | b5520365b42d4c26ae1f1a8c5e0a9eee81e84e7b /drivers/net/sky2.h | |
parent | a6ef5e9d7dd6f3de4f88b68c390f0f0d7072944c (diff) |
sky2: fix PM related regressions
Fix the problems reported for 2.6.27-rc1 caused by over aggressive
power management. Turning clock off on PCI Express is problematic for WOL,
and when doing multi-booting.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 4d9c4a19bb85..92fb24b27d45 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -2072,9 +2072,7 @@ struct sky2_hw { | |||
2072 | #define SKY2_HW_NEW_LE 0x00000020 /* new LSOv2 format */ | 2072 | #define SKY2_HW_NEW_LE 0x00000020 /* new LSOv2 format */ |
2073 | #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ | 2073 | #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ |
2074 | #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ | 2074 | #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ |
2075 | #define SKY2_HW_CLK_POWER 0x00000100 /* clock power management */ | ||
2076 | 2075 | ||
2077 | int pm_cap; | ||
2078 | u8 chip_id; | 2076 | u8 chip_id; |
2079 | u8 chip_rev; | 2077 | u8 chip_rev; |
2080 | u8 pmd_type; | 2078 | u8 pmd_type; |