diff options
| author |   Matt Carlson <mcarlson@broadcom.com> | 2010-02-12 14:47:10 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-02-12 17:05:54 -0800 |
| commit | 603f11738cee4d46a2a1d394ae80d718f8d37cba (patch) | |
| tree | 801086e849fc3039ad4bb7dda9d5c07d0d9bd550 /drivers/net/tg3.c | |
| parent | tg3: Turn off multiple DMA reads for 5717 (diff) | |
| download | linux-dev-603f11738cee4d46a2a1d394ae80d718f8d37cba.tar.xz linux-dev-603f11738cee4d46a2a1d394ae80d718f8d37cba.zip | |
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/tg3.c')
| -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) tg3_abort_hw(tp, 1); } - if (reset_phy && - !(tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB)) + if (reset_phy) tg3_phy_reset(tp); err = tg3_chip_reset(tp); |