Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7698ad8c authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

net: phylink: ensure consistent phy interface mode 



[ Upstream commit c678726305b9425454be7c8a7624290b602602fc ]

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: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8fb2c796

drivers/net/phy/phylink.c

+7 −3
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ struct phylink { 


	/* The link configuration settings */

	struct phylink_link_state link_config;



	/* The current settings */

	phy_interface_t cur_interface;



	struct gpio_desc *link_gpio;

	struct timer_list link_poll;

	void (*get_fixed_state)(struct net_device *dev,
@@ -477,12 +481,12 @@ static void phylink_resolve(struct work_struct *w) 
		if (!link_state.link) {

			netif_carrier_off(ndev);

			pl->ops->mac_link_down(ndev, pl->link_an_mode,

					       pl->phy_state.interface);

					       pl->cur_interface);

			netdev_info(ndev, "Link is Down\n");

		} else {

			pl->cur_interface = link_state.interface;

			pl->ops->mac_link_up(ndev, pl->link_an_mode,

					     pl->phy_state.interface,

					     pl->phydev);

					     pl->cur_interface, pl->phydev);



			netif_carrier_on(ndev);