aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-24 13:39:12 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-06-24 16:36:30 +0200
commit92b8fe0e0e2027ec2b53a596dc0c1398583796b9 (patch)
treee9c1cb58e69ab4372d4202560f16a0104f9bf118 /target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch
parent4589f23943a3820c8611adc0ec2fa8052df275a0 (diff)
downloadupstream-92b8fe0e0e2027ec2b53a596dc0c1398583796b9.tar.gz
upstream-92b8fe0e0e2027ec2b53a596dc0c1398583796b9.tar.bz2
upstream-92b8fe0e0e2027ec2b53a596dc0c1398583796b9.zip
kernel: bump 4.19 to 4.19.55
Refreshed all patches. Compile-tested on: imx6 Runtime-tested on: imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch')
-rw-r--r--target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch b/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch
index 0dc2605077..611999baea 100644
--- a/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch
+++ b/target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch
@@ -13,7 +13,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -333,6 +333,13 @@ static void phylink_mac_config(struct ph
+@@ -337,6 +337,13 @@ static void phylink_mac_config(struct ph
pl->ops->mac_config(pl->netdev, pl->link_an_mode, state);
}
@@ -27,7 +27,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
static void phylink_mac_an_restart(struct phylink *pl)
{
if (pl->link_config.an_enabled &&
-@@ -436,12 +443,12 @@ static void phylink_resolve(struct work_
+@@ -440,12 +447,12 @@ static void phylink_resolve(struct work_
case MLO_AN_PHY:
link_state = pl->phy_state;
phylink_resolve_flow(pl, &link_state);