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: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
9f6f9af769
Коммит
34655ad638
|
@ -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)
|
||||
|
|
|
@ -3064,6 +3064,7 @@ struct tg3 {
|
|||
|
||||
struct mii_bus *mdio_bus;
|
||||
int mdio_irq[PHY_MAX_ADDR];
|
||||
int old_link;
|
||||
|
||||
u8 phy_addr;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче