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-08-12 11:52:25 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-08-14 18:23:08 +0200
commitc9dc0e1bdf9274581b588a82226c70a192a36556 (patch)
tree9bbabded082a4b1f47c6c222bd17ab7298421aa8 /target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch
parent873a8c50788e3b36d908e1c71502ea9332a9673d (diff)
downloadupstream-c9dc0e1bdf9274581b588a82226c70a192a36556.tar.gz
upstream-c9dc0e1bdf9274581b588a82226c70a192a36556.tar.bz2
upstream-c9dc0e1bdf9274581b588a82226c70a192a36556.zip
kernel: bump 4.19 to 4.19.66
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx 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 611999baea..0e272ea891 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
-@@ -337,6 +337,13 @@ static void phylink_mac_config(struct ph
+@@ -339,6 +339,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 &&
-@@ -440,12 +447,12 @@ static void phylink_resolve(struct work_
+@@ -442,12 +449,12 @@ static void phylink_resolve(struct work_
case MLO_AN_PHY:
link_state = pl->phy_state;
phylink_resolve_flow(pl, &link_state);