[PATCH net] net: phylink: ensure consistent phy interface mode

[PATCH net] net: phylink: ensure consistent phy interface mode

[Russell King]

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>
---
 drivers/net/phy/phylink.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 74983593834b..9044b95d2afe 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -51,6 +51,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,
@@ -446,12 +450,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);
 
-- 
2.7.4

Re: [PATCH net] net: phylink: ensure consistent phy interface mode

[Andrew Lunn]

On Tue, May 28, 2019 at 10:27:21AM +0100, Russell King wrote:
> 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>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

Re: [PATCH net] net: phylink: ensure consistent phy interface mode

[Russell King - ARM Linux admin]

On Fri, May 31, 2019 at 03:02:26PM +0200, Andrew Lunn wrote:
> On Tue, May 28, 2019 at 10:27:21AM +0100, Russell King wrote:
> > 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>
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Hi Andrew,

davem already applied this patch a couple of days ago, since it is a
dependency for other patches.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up