summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-12-13 11:06:30 +0100
committerJakub Kicinski <jakub.kicinski@netronome.com>2019-12-15 06:47:23 +0100
commit9b2079c046a9d6c9c73a4ec33816678565ee01f3 (patch)
tree059aba2a3e41de42d0e435779cd6202b04b2ed38 /drivers
parentselftests: net: tls: remove recv_rcvbuf test (diff)
downloadlinux-9b2079c046a9d6c9c73a4ec33816678565ee01f3.tar.xz
linux-9b2079c046a9d6c9c73a4ec33816678565ee01f3.zip
net: phylink: fix interface passed to mac_link_up
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> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/phylink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 9a616d6bc4eb..1585eebb73fe 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);