This is a note to let you know that I've just added the patch titled
net: phylink: fix interface passed to mac_link_up
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-phylink-fix-interface-passed-to-mac_link_up.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed 01 Jan 2020 10:35:31 PM CET
From: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
Date: Fri, 13 Dec 2019 10:06:30 +0000
Subject: net: phylink: fix interface passed to mac_link_up
From: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
[ 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@xxxxxxxxxxxxxxx>
Signed-off-by: Jakub Kicinski <jakub.kicinski@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/phy/phylink.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -444,8 +444,7 @@ static void phylink_mac_link_up(struct p
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);
Patches currently in stable-queue which might be from rmk+kernel@xxxxxxxxxxxxxxx are
queue-5.4/net-marvell-mvpp2-phylink-requires-the-link-interrupt.patch
queue-5.4/gpio-mpc8xxx-fix-qoriq-gpio-reading.patch
queue-5.4/arm-8937-1-spectre-v2-remove-brahma-b53-from-hardeni.patch
queue-5.4/net-phylink-fix-interface-passed-to-mac_link_up.patch
