* [PATCH net] net: phylink: fix interface passed to mac_link_up
@ 2019-12-13 10:06 Russell King
2019-12-15 5:51 ` Jakub Kicinski
0 siblings, 1 reply; 6+ messages in thread
From: Russell King @ 2019-12-13 10:06 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, Heiner Kallweit; +Cc: David S. Miller, netdev
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>
---
drivers/net/phy/phylink.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 1e6c031985c9..2c360e4e3cff 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -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);
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net] net: phylink: fix interface passed to mac_link_up
2019-12-13 10:06 [PATCH net] net: phylink: fix interface passed to mac_link_up Russell King
@ 2019-12-15 5:51 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2019-12-15 5:51 UTC (permalink / raw)
To: Russell King
Cc: Andrew Lunn, Florian Fainelli, Heiner Kallweit, David S. Miller, netdev
On Fri, 13 Dec 2019 10:06:30 +0000, Russell King wrote:
> 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>
Applied and queued for stable (5.3, 5.4). Thank you!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] net: phylink: fix interface passed to mac_link_up
2019-12-13 0:03 ` Russell King - ARM Linux admin
@ 2019-12-13 0:57 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-12-13 0:57 UTC (permalink / raw)
To: linux; +Cc: andrew, f.fainelli, hkallweit1, netdev
From: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Date: Fri, 13 Dec 2019 00:03:23 +0000
> On Thu, Dec 12, 2019 at 10:55:44AM -0800, David Miller wrote:
>> From: Russell King <rmk+kernel@armlinux.org.uk>
>> Date: Thu, 12 Dec 2019 10:32:15 +0000
>>
>> > 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>
>>
>> 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'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] net: phylink: fix interface passed to mac_link_up
2019-12-12 18:55 ` David Miller
@ 2019-12-13 0:03 ` Russell King - ARM Linux admin
2019-12-13 0:57 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Russell King - ARM Linux admin @ 2019-12-13 0:03 UTC (permalink / raw)
To: David Miller; +Cc: andrew, f.fainelli, hkallweit1, netdev
On Thu, Dec 12, 2019 at 10:55:44AM -0800, David Miller wrote:
> From: Russell King <rmk+kernel@armlinux.org.uk>
> Date: Thu, 12 Dec 2019 10:32:15 +0000
>
> > 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>
>
> 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?
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net] net: phylink: fix interface passed to mac_link_up
2019-12-12 10:32 Russell King
@ 2019-12-12 18:55 ` David Miller
2019-12-13 0:03 ` Russell King - ARM Linux admin
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2019-12-12 18:55 UTC (permalink / raw)
To: rmk+kernel; +Cc: andrew, f.fainelli, hkallweit1, netdev
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Thu, 12 Dec 2019 10:32:15 +0000
> 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>
Does not apply to the 'net' tree.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net] net: phylink: fix interface passed to mac_link_up
@ 2019-12-12 10:32 Russell King
2019-12-12 18:55 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Russell King @ 2019-12-12 10:32 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, Heiner Kallweit; +Cc: David S. Miller, netdev
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>
---
drivers/net/phy/phylink.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 1e6c031985c9..2c360e4e3cff 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -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);
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-15 5:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-13 10:06 [PATCH net] net: phylink: fix interface passed to mac_link_up Russell King
2019-12-15 5:51 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2019-12-12 10:32 Russell King
2019-12-12 18:55 ` David Miller
2019-12-13 0:03 ` Russell King - ARM Linux admin
2019-12-13 0:57 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.