OSDN Git Service

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)
commit9b2079c046a9d6c9c73a4ec33816678565ee01f3
tree059aba2a3e41de42d0e435779cd6202b04b2ed38
parent6dd504b0fd1039c6e5d391e97cf5c4ee592aefcb
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>
drivers/net/phy/phylink.c