Skip to contentSkip to conversation

tg3: Call netif_carrier_off() during phy reset

PATCH Applied Michael Chan 2 participants 2 messages Apr 29, 2006 – Apr 30, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/6 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.

drivers/net/tg3.c +7 -0
index 73e271e..a28accb 100644
@@ -974,6 +974,8 @@ static int tg3_phy_reset_5703_4_5(struct
 	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) {
maintainer Applied
#1 lore raw

From: "Michael Chan" <[email protected]>
Date: Fri, 28 Apr 2006 16:35:06 -0700

Quoted 6 lines

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.

Applied, thanks.