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

Commit 34655ad6 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Fix link check in tg3_adjust_link 



The tg3 driver tried to detect link changes by comparing the tg3 local
active_speed member with SPEED_UNKNOWN (or formerly SPEED_INVALID).
This check is not correct, since phylib will never set its speed member
to either of these two values.  The code only appeared to work because
tg3 initializes active_speed to SPEED_INVALID during tg3_init_one.  This
patch introduces a new "old_link" tg3 member and then compares the
phy_device's link member against it to detect link state changes.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f6f9af7

drivers/net/ethernet/broadcom/tg3.c

+4 −2
Original line number Diff line number Diff line
@@ -1819,13 +1819,13 @@ static void tg3_adjust_link(struct net_device *dev) 
		      (6 << TX_LENGTHS_IPG_SHIFT) |

		      (32 << TX_LENGTHS_SLOT_TIME_SHIFT)));



	if ((phydev->link && tp->link_config.active_speed == SPEED_UNKNOWN) ||

	    (!phydev->link && tp->link_config.active_speed != SPEED_UNKNOWN) ||

	if (phydev->link != tp->old_link ||

	    phydev->speed != tp->link_config.active_speed ||

	    phydev->duplex != tp->link_config.active_duplex ||

	    oldflowctrl != tp->link_config.active_flowctrl)

		linkmesg = 1;



	tp->old_link = phydev->link;

	tp->link_config.active_speed = phydev->speed;

	tp->link_config.active_duplex = phydev->duplex;
@@ -13352,6 +13352,8 @@ static void __devinit tg3_phy_init_link_config(struct tg3 *tp) 
	tp->link_config.autoneg = AUTONEG_ENABLE;

	tp->link_config.active_speed = SPEED_UNKNOWN;

	tp->link_config.active_duplex = DUPLEX_UNKNOWN;



	tp->old_link = -1;

}



static int __devinit tg3_phy_probe(struct tg3 *tp)

drivers/net/ethernet/broadcom/tg3.h

+1 −0
Original line number Diff line number Diff line
@@ -3064,6 +3064,7 @@ struct tg3 { 


	struct mii_bus			*mdio_bus;

	int				mdio_irq[PHY_MAX_ADDR];

	int				old_link;



	u8				phy_addr;