net: phylink: propagate resolved link config via mac_link_up()
Propagate the resolved link parameters via the mac_link_up() call for MACs that do not automatically track their PCS state. We propagate the link parameters via function arguments so that inappropriate members of struct phylink_link_state can't be accessed, and creating a new structure just for this adds needless complexity to the API. Tested-by: Andre Przywara <andre.przywara@arm.com> Tested-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
2e6af0f304
commit
91a208f218
@@ -480,8 +480,11 @@ static void phylink_mac_link_up(struct phylink *pl,
|
||||
struct net_device *ndev = pl->netdev;
|
||||
|
||||
pl->cur_interface = link_state.interface;
|
||||
pl->ops->mac_link_up(pl->config, pl->cur_link_an_mode,
|
||||
pl->cur_interface, pl->phydev);
|
||||
pl->ops->mac_link_up(pl->config, pl->phydev,
|
||||
pl->cur_link_an_mode, pl->cur_interface,
|
||||
link_state.speed, link_state.duplex,
|
||||
!!(link_state.pause & MLO_PAUSE_TX),
|
||||
!!(link_state.pause & MLO_PAUSE_RX));
|
||||
|
||||
if (ndev)
|
||||
netif_carrier_on(ndev);
|
||||
@@ -547,6 +550,8 @@ static void phylink_resolve(struct work_struct *w)
|
||||
link_state.pause = pl->phy_state.pause;
|
||||
phylink_apply_manual_flow(pl, &link_state);
|
||||
phylink_mac_config(pl, &link_state);
|
||||
} else {
|
||||
phylink_apply_manual_flow(pl, &link_state);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user