diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2010-02-12 09:47:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-12 20:05:54 -0500 |
commit | 603f11738cee4d46a2a1d394ae80d718f8d37cba (patch) | |
tree | 801086e849fc3039ad4bb7dda9d5c07d0d9bd550 /drivers/net | |
parent | 0339e4e3effeae71e2b19c6340ef9672fb7a2cb3 (diff) |
tg3: Reset phy during bringup when using phylib
The driver puts the phy into low-power mode when it releases the device.
If the device were to be reacquired, the phy needs a reset to bring it
back to full powered operation. This patch allows phylib-enabled
devices to reset the phy.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tg3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 673ea314aa18..33dfb7fda8cc 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -7595,8 +7595,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) | |||
7595 | tg3_abort_hw(tp, 1); | 7595 | tg3_abort_hw(tp, 1); |
7596 | } | 7596 | } |
7597 | 7597 | ||
7598 | if (reset_phy && | 7598 | if (reset_phy) |
7599 | !(tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB)) | ||
7600 | tg3_phy_reset(tp); | 7599 | tg3_phy_reset(tp); |
7601 | 7600 | ||
7602 | err = tg3_chip_reset(tp); | 7601 | err = tg3_chip_reset(tp); |