aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2008-11-21 17:21:13 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-21 17:21:13 -0800
commit22435849a6dcde2ce10d1870aba461a54e347fe3 (patch)
treef163f32746669311fb50a5255ea050977db2af93
parentd5fe488a7b59e41b98b91137805159466b7b49c2 (diff)
downloadkernel_samsung_aries-22435849a6dcde2ce10d1870aba461a54e347fe3.zip
kernel_samsung_aries-22435849a6dcde2ce10d1870aba461a54e347fe3.tar.gz
kernel_samsung_aries-22435849a6dcde2ce10d1870aba461a54e347fe3.tar.bz2
tg3: Allow GPHY powerdown on 5761
The ENABLE_APE flag tells the driver whether or not the device has an Application Processing Engine (APE). The APE does not need the PHY to be powered unless it is running management firmware. For backwards compatibility, management firmware will still set the ENABLE_ASF bit. Consequently, there is no reason to consider the ENABLE_APE flag when deciding whether or not to power down the phy. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 89d897d..07bf056 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -2400,8 +2400,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
}
if (!(device_should_wake) &&
- !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
- !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE))
+ !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
tg3_power_down_phy(tp, do_low_power);
tg3_frob_aux_power(tp);