net: phylink: update PCS when changing interface during resolution

The only PHYs that are used with phylink which change their interface
are the BCM84881 and MV88X3310 family, both of which only change their
interface modes on link-up events.  This will break when drivers are
converted to split-PCS.  Fix this.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 1507ea8..f1693ec 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -629,8 +629,15 @@ static void phylink_resolve(struct work_struct *w)
                                phylink_link_down(pl);
                                cur_link_state = false;
                        }
+                       phylink_pcs_config(pl, false, &link_state);
+                       pl->link_config.interface = link_state.interface;
+               } else {
+                       /* The interface remains unchanged, only the speed,
+                        * duplex or pause settings have changed. Call the
+                        * old mac_config() method to configure the MAC/PCS.
+                        */
+                       phylink_mac_config(pl, &link_state);
                }
-               phylink_mac_config(pl, &link_state);
        }
 
        if (link_state.link != cur_link_state) {