]> git.baikalelectronics.ru Git - kernel.git/commit
net: phylink: fix interface passed to mac_link_up
authorRussell King <rmk+kernel@armlinux.org.uk>
Fri, 13 Dec 2019 10:06:30 +0000 (10:06 +0000)
committerJakub Kicinski <jakub.kicinski@netronome.com>
Sun, 15 Dec 2019 05:47:23 +0000 (21:47 -0800)
commit00b6672ff5a5d2b02d9403498e3119b9fd80e0a9
tree059aba2a3e41de42d0e435779cd6202b04b2ed38
parent52d4ad0c1d5816ef8d27d0e4d9a3e26d6dc219df
net: phylink: fix interface passed to mac_link_up

A mismerge between the following two commits:

60ae52055319 ("net: phylink: ensure consistent phy interface mode")
904a02fb7b20 ("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: df8911d674e0 ("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>
drivers/net/phy/phylink.c