Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8e1e82b authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c302e6d5

drivers/net/tg3.c

+7 −0
Original line number Diff line number Diff line
@@ -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) {