diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-04-30 03:55:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-04-30 03:55:17 +0200 |
| commit | c8e1e82b6a97ad44517517aa58b7b794ead0bf33 (patch) | |
| tree | 3044a83b7de83a70a0fa506e2c09d85e7311b3ae /drivers/net/tg3.c | |
| parent | [IPV6]: Fix race in route selection. (diff) | |
| download | linux-c8e1e82b6a97ad44517517aa58b7b794ead0bf33.tar.xz linux-c8e1e82b6a97ad44517517aa58b7b794ead0bf33.zip | |
[TG3]: Call netif_carrier_off() during phy reset
Add netif_carrier_off() call during tg3_phy_reset(). This is needed
to properly track the netif_carrier state in cases where we do a
PHY reset with interrupts disabled. The SerDes code will not run
properly if the netif_carrier state is wrong.
Signed-off-by: Michael Chan <mchan@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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 73e271e59c6a..a28accbfcdf7 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -974,6 +974,8 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) return err; } +static void tg3_link_report(struct tg3 *); + /* This will reset the tigon3 PHY if there is no valid * link unless the FORCE argument is non-zero. */ @@ -987,6 +989,11 @@ static int tg3_phy_reset(struct tg3 *tp) if (err != 0) return -EBUSY; + if (netif_running(tp->dev) && netif_carrier_ok(tp->dev)) { + netif_carrier_off(tp->dev); + tg3_link_report(tp); + } + if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) { |