diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2009-06-02 11:28:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 02:46:32 -0700 |
| commit | 918d7197aa18a562eb7dc37b80a87e9ff1d7f7d9 (patch) | |
| tree | 89bfc3556443abda48e6d4ec7789a3d6f7b872b0 /drivers | |
| parent | 6e50912a442947d5fafd296ca6fdcbeb36b163ff (diff) | |
| download | linux-3.10-918d7197aa18a562eb7dc37b80a87e9ff1d7f7d9.tar.gz linux-3.10-918d7197aa18a562eb7dc37b80a87e9ff1d7f7d9.tar.bz2 linux-3.10-918d7197aa18a562eb7dc37b80a87e9ff1d7f7d9.zip | |
e1000e: do not attempt to disable smart powerdown if not supported
During reset, the driver was attempting to disable the Smart Powerdown
feature even if the part does not support Smart Powerdown. Check for
support before attempting to disable the feature.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index f012cc62eff..7e412d1168e 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -2799,7 +2799,8 @@ void e1000e_reset(struct e1000_adapter *adapter) e1000e_reset_adaptive(hw); e1000_get_phy_info(hw); - if (!(adapter->flags & FLAG_SMART_POWER_DOWN)) { + if ((adapter->flags & FLAG_HAS_SMART_POWER_DOWN) && + !(adapter->flags & FLAG_SMART_POWER_DOWN)) { u16 phy_data = 0; /* * speed up time to link by disabling smart power down, ignore |