tg3: Update link_up flag for phylib devices
Subsystems (3)
PATCH 1/1 tg3: Update link_up flag for phylib devices
Commit f4a46d1f46a8fece34edd2023e054072b02e110d introduced a bug where the ifconfig stats would remain 0 for phylib devices. This is due to tp->link_up flag never becoming true causing tg3_periodic_fetch_stats() to return.
The link_up flag was being updated in tg3_test_and_report_link_chg() after setting up the phy. This function however, is not called for phylib devices since the driver does not do the phy setup.
This patch moves the link_up flag update into the common tg3_link_report() function that gets called for phylib devices as well for non phylib devices when the link state changes.
To avoid updating link_up twice, we replace tg3_carrier_...() calls that are followed by tg3_link_report(), with netif_carrier_...(). We can then remove the unused tg3_carrier_on() function.
--- drivers/net/ethernet/broadcom/tg3.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +5 -9
@@ -1869,6 +1869,8 @@ static void tg3_link_report(struct tg3 *tp)tg3_ump_link_report (tp); } + + tp->link_up =netif_carrier_ok (tp->dev); }static u16 tg3_advert_flowctrl_1000X (u8 flow_ctrl)
@@ -2522,12 +2524,6 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)return err; } -static void tg3_carrier_on (struct tg3 *tp) -{ -netif_carrier_on (tp->dev); - tp->link_up = true; -} -static void tg3_carrier_off (struct tg3 *tp) {netif_carrier_off (tp->dev);
@@ -2553,7 +2549,7 @@ static int tg3_phy_reset(struct tg3 *tp)return -EBUSY ;if (netif_running (tp->dev) && tp->link_up) { -tg3_carrier_off (tp); +netif_carrier_off (tp->dev);tg3_link_report (tp); }
@@ -4262,9 +4258,9 @@ static bool tg3_test_and_report_link_chg(struct tg3 *tp, int curr_link_up) {if (curr_link_up != tp->link_up) {if (curr_link_up) { -tg3_carrier_on (tp); +netif_carrier_on (tp->dev); }else { -tg3_carrier_off (tp); +netif_carrier_off (tp->dev);if (tp->phy_flags &TG3_PHYFLG_MII_SERDES ) tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT ; }
Signature · 1 line
1.8.1.4
From: "Nithin Nayak Sujir" <[email protected]>
Date: Fri, 8 Mar 2013 10:01:24 -0800
Quoted 13 lines
Commit
f4a46d1f46a8fece34edd2023e054072b02e110dintroduced a bug where the ifconfig stats would remain 0 for phylib devices. This is due totp->link_upflag never becoming true causingtg3_periodic_fetch_stats()to return.The
link_upflag was being updated intg3_test_and_report_link_chg()after setting up the phy. This function however, is not called for phylib devices since the driver does not do the phy setup.This patch moves the
link_upflag update into the commontg3_link_report()function that gets called for phylib devices as well for non phylib devices when the link state changes.
Quoted 8 lines
To avoid updating
link_uptwice, we replace tg3_carrier_...() calls that are followed bytg3_link_report(), with netif_carrier_...(). We can then remove the unusedtg3_carrier_on()function.CC <[email protected]>Reported-by OGAWA Hirofumi <[email protected]>Signed-off-by Nithin Nayak Sujir <[email protected]>Signed-off-by Michael Chan <[email protected]>
Applied, thanks.