Commit bb417456 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by David S. Miller
Browse files

tg3: Fix race for querying speed/duplex 



When driver signals carrier up via netif_carrier_on() its internal
link_up state isn't updated immediately. This leads to inconsistent
speed/duplex in /proc/net/bonding/bondX where the speed and duplex
is shown as unknown while ethtool shows correct values. Fix this by
using netif_carrier_ok() for link checking in get_ksettings function.

Fixes: 84421b99 ("tg3: Update link_up flag for phylib devices")
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e67ba9b

drivers/net/ethernet/broadcom/tg3.c

+1 −1
Original line number Diff line number Diff line
@@ -12299,7 +12299,7 @@ static int tg3_get_link_ksettings(struct net_device *dev, 
	ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,

						advertising);



	if (netif_running(dev) && tp->link_up) {

	if (netif_running(dev) && netif_carrier_ok(dev)) {

		cmd->base.speed = tp->link_config.active_speed;

		cmd->base.duplex = tp->link_config.active_duplex;

		ethtool_convert_legacy_u32_to_link_mode(