Commit 9b2079c0 authored Dec 13, 2019 by Russell King Committed by Jakub Kicinski Dec 14, 2019

net: phylink: fix interface passed to mac_link_up

A mismerge between the following two commits:

c6787263 ("net: phylink: ensure consistent phy interface mode")
27755ff8 ("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: b4b12b0d ("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>

parent 6dd504b0

drivers/net/phy/phylink.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message