Skip to contentSkip to conversation

net: phylink: fix interface passed to mac_link_up

PATCH In review Russell King 3 participants 4 messages Dec 12, 2019 – Dec 13, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/net/phy/phylink.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/phy/phylink.c +1 -2
index 1e6c031985c9..2c360e4e3cff 100644
@@ -446,8 +446,7 @@ static void phylink_mac_link_up(struct phylink *pl,
 
 	pl->cur_interface = link_state.interface;
 	pl->ops->mac_link_up(pl->config, pl->cur_link_an_mode,
-			     pl->phy_state.interface,
-			     pl->phydev);
+			     pl->cur_interface, pl->phydev);
 
 	if (ndev)
 		netif_carrier_on(ndev);
Signature · 1 line
2.20.1
maintainer
#1 lore raw

From: Russell King <[email protected]>
Date: Thu, 12 Dec 2019 10:32:15 +0000

Quoted 10 lines

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")

Does not apply to the 'net' tree.

#2 lore raw
Quoted 8 lines · David Miller

From: Russell King <[email protected]>
Date: Thu, 12 Dec 2019 10:32:15 +0000

Quoted 5 lines

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")

Quoted 7 lines
Quoted 5 lines

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")

Does not apply to the 'net' tree.

The reason it doesn't apply is the change from link_an_mode to cur_link_an_mode on the preceeding line that is in net-next. Fixing this in net is going to create another merge conflict.

Would it be better to apply this one to net-next and a similar fix to the net tree?

Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
maintainer
#3 lore raw

From: Russell King - ARM Linux admin <[email protected]>
Date: Fri, 13 Dec 2019 00:03:23 +0000

Quoted 15 lines · David Miller
Quoted 14 lines

From: Russell King <[email protected]>
Date: Thu, 12 Dec 2019 10:32:15 +0000

Quoted 10 lines

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")
Quoted 8 lines
Quoted 1 line

Does not apply to the 'net' tree.

The reason it doesn't apply is the change from link_an_mode to cur_link_an_mode on the preceeding line that is in net-next. Fixing this in net is going to create another merge conflict.

Would it be better to apply this one to net-next and a similar fix to the net tree?

I can handle such trivial merge conflicts when I merge net into net-next. Especially if you let me know about it like you did here.

Please respin this for 'net'