diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-13 10:06:30 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-04 19:19:17 +0100 |
| commit | 06067fd5a24b01957d5ca67192280f9e80b4bd6f (patch) | |
| tree | bd4d036ead3a8a7d0ebe2df178b925fc19cb5a46 /drivers/net/phy/phylink.c | |
| parent | 8fa4ec03512d603efdd22d7a9bc45a22a99d122f (diff) | |
| download | linux-stable-06067fd5a24b01957d5ca67192280f9e80b4bd6f.tar.gz linux-stable-06067fd5a24b01957d5ca67192280f9e80b4bd6f.tar.bz2 linux-stable-06067fd5a24b01957d5ca67192280f9e80b4bd6f.zip | |
net: phylink: fix interface passed to mac_link_up
[ Upstream commit 9b2079c046a9d6c9c73a4ec33816678565ee01f3 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/phy/phylink.c')
| -rw-r--r-- | drivers/net/phy/phylink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 536236fdb232..bf5bbb565cf5 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -444,8 +444,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); |