iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phylink: ensure consistent phy interface mode

Browse Source 
Ensure that we supply the same phy interface mode to mac_link_down() as
we did for the corresponding mac_link_up() call.  This ensures that MAC
drivers that use the phy interface mode in these methods can depend on
mac_link_down() always corresponding to a mac_link_up() call for the
same interface mode.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2019-05-28 10:27:21 +01:00 committed by David S. Miller
parent 315ca92dd8
commit c678726305
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/phy/phylink.c
View File

@ -51,6 +51,10 @@ struct phylink {
/* The link configuration settings */ /* The link configuration settings */
struct phylink_link_state link_config; struct phylink_link_state link_config;
/* The current settings */
phy_interface_t cur_interface;
struct gpio_desc *link_gpio; struct gpio_desc *link_gpio;
struct timer_list link_poll; struct timer_list link_poll;
void (*get_fixed_state)(struct net_device *dev, void (*get_fixed_state)(struct net_device *dev,
@ -446,12 +450,12 @@ static void phylink_resolve(struct work_struct *w)
if (!link_state.link) { if (!link_state.link) {
netif_carrier_off(ndev); netif_carrier_off(ndev);
pl->ops->mac_link_down(ndev, pl->link_an_mode, pl->ops->mac_link_down(ndev, pl->link_an_mode,
pl->phy_state.interface); pl->cur_interface);
netdev_info(ndev, "Link is Down\n"); netdev_info(ndev, "Link is Down\n");
} else { } else {
pl->cur_interface = link_state.interface;
pl->ops->mac_link_up(ndev, pl->link_an_mode, pl->ops->mac_link_up(ndev, pl->link_an_mode,
pl->phy_state.interface, pl->cur_interface, pl->phydev);
pl->phydev);
netif_carrier_on(ndev); netif_carrier_on(ndev);