| Message ID | E1ifhqA-0000NQ-9y@rmk-PC.armlinux.org.uk |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: phylink: fix interface passed to mac_link_up | expand |
On Fri, 13 Dec 2019 10:06:30 +0000, Russell King wrote: > A mismerge between the following two commits: > > c678726305b9 ("net: phylink: ensure consistent phy interface mode") > 27755ff88c0e ("net: phylink: Add phylink_mac_link_{up, down} wrapper functions") > > resulted in the wrong interface being passed to the mac_link_up() > function. Fix this up. > > Fixes: b4b12b0d2f02 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Applied and queued for stable (5.3, 5.4). Thank you!
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 1e6c031985c9..2c360e4e3cff 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -442,8 +442,7 @@ static void phylink_mac_link_up(struct phylink *pl, pl->cur_interface = link_state.interface; pl->ops->mac_link_up(pl->config, pl->link_an_mode, - pl->phy_state.interface, - pl->phydev); + pl->cur_interface, pl->phydev); if (ndev) netif_carrier_on(ndev);
A mismerge between the following two commits: c678726305b9 ("net: phylink: ensure consistent phy interface mode") 27755ff88c0e ("net: phylink: Add phylink_mac_link_{up, down} wrapper functions") resulted in the wrong interface being passed to the mac_link_up() function. Fix this up. Fixes: b4b12b0d2f02 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/phylink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)