tg3: Update link_up flag for phylib devices
Commit f4a46d1f46
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.
CC: <stable@vger.kernel.org>
Reported-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ddf64354af
commit
84421b99ce
|
@ -1869,6 +1869,8 @@ static void tg3_link_report(struct tg3 *tp)
|
||||||
|
|
||||||
tg3_ump_link_report(tp);
|
tg3_ump_link_report(tp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tp->link_up = netif_carrier_ok(tp->dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static u16 tg3_advert_flowctrl_1000X(u8 flow_ctrl)
|
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;
|
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)
|
static void tg3_carrier_off(struct tg3 *tp)
|
||||||
{
|
{
|
||||||
netif_carrier_off(tp->dev);
|
netif_carrier_off(tp->dev);
|
||||||
|
@ -2553,7 +2549,7 @@ static int tg3_phy_reset(struct tg3 *tp)
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
|
||||||
if (netif_running(tp->dev) && tp->link_up) {
|
if (netif_running(tp->dev) && tp->link_up) {
|
||||||
tg3_carrier_off(tp);
|
netif_carrier_off(tp->dev);
|
||||||
tg3_link_report(tp);
|
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 != tp->link_up) {
|
||||||
if (curr_link_up) {
|
if (curr_link_up) {
|
||||||
tg3_carrier_on(tp);
|
netif_carrier_on(tp->dev);
|
||||||
} else {
|
} else {
|
||||||
tg3_carrier_off(tp);
|
netif_carrier_off(tp->dev);
|
||||||
if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
|
if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
|
||||||
tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
|
tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue