aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-31 19:41:26 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-08-10 19:34:37 +0200
commitfdac05b7416b7355f565065bdbc158e0ede7133e (patch)
tree7b3390b953cfd4880d399b6906a7c3f056adc34d /target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
parentfce0f1501b12b54c0961802ff10b4b5f24a1a33d (diff)
downloadupstream-fdac05b7416b7355f565065bdbc158e0ede7133e.tar.gz
upstream-fdac05b7416b7355f565065bdbc158e0ede7133e.tar.bz2
upstream-fdac05b7416b7355f565065bdbc158e0ede7133e.zip
kernel: Update kernel 4.19 to version 4.19.138
Compile and run tested on lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch')
-rw-r--r--target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch b/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
index 74dc39fa7f..0600da2fad 100644
--- a/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
+++ b/target/linux/generic/backport-4.19/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch
@@ -51,7 +51,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
.link_down = phylink_sfp_link_down,
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
-@@ -350,7 +350,7 @@ static int sfp_register_bus(struct sfp_b
+@@ -425,7 +425,7 @@ static int sfp_register_bus(struct sfp_b
bus->socket_ops->attach(bus->sfp);
if (bus->started)
bus->socket_ops->start(bus->sfp);
@@ -60,7 +60,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
bus->registered = true;
return 0;
}
-@@ -359,8 +359,8 @@ static void sfp_unregister_bus(struct sf
+@@ -434,8 +434,8 @@ static void sfp_unregister_bus(struct sf
{
const struct sfp_upstream_ops *ops = bus->upstream_ops;