aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-05-28 10:27:21 +0100
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-16 12:21:42 -0400
commitc0de0ca4f0760b1b45257be5c843514ceb4762df (patch)
treedc9870217ac427a0c5cc1989dbc7ffb9991c36c5
parentc9dd47f41217a8b9f0dc7b5d02c7144197eddf78 (diff)
downloadlinux-yocto-c0de0ca4f0760b1b45257be5c843514ceb4762df.tar.gz
linux-yocto-c0de0ca4f0760b1b45257be5c843514ceb4762df.tar.bz2
linux-yocto-c0de0ca4f0760b1b45257be5c843514ceb4762df.zip
net: phylink: ensure consistent phy interface mode
commit c678726305b9425454be7c8a7624290b602602fc upstream. 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> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--drivers/net/phy/phylink.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 06bfd51670d8..2e157f475210 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -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);