diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-31 19:41:26 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-10 19:34:37 +0200 |
| commit | fdac05b7416b7355f565065bdbc158e0ede7133e (patch) | |
| tree | 7b3390b953cfd4880d399b6906a7c3f056adc34d /target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch | |
| parent | fce0f1501b12b54c0961802ff10b4b5f24a1a33d (diff) | |
| download | upstream-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/717-v5.5-net-sfp-rework-upstream-interface.patch')
| -rw-r--r-- | target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch b/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch index f7dd187c16..a901b15aaf 100644 --- a/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch +++ b/target/linux/generic/backport-4.19/717-v5.5-net-sfp-rework-upstream-interface.patch @@ -53,7 +53,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c -@@ -328,10 +328,19 @@ static void sfp_bus_release(struct kref +@@ -403,10 +403,19 @@ static void sfp_bus_release(struct kref kfree(bus); } @@ -75,7 +75,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> static int sfp_register_bus(struct sfp_bus *bus) { -@@ -347,11 +356,11 @@ static int sfp_register_bus(struct sfp_b +@@ -422,11 +431,11 @@ static int sfp_register_bus(struct sfp_b return ret; } } @@ -88,7 +88,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> return 0; } -@@ -445,13 +454,12 @@ static void sfp_upstream_clear(struct sf +@@ -520,13 +529,12 @@ static void sfp_upstream_clear(struct sf } /** @@ -106,7 +106,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> * * Returns: on success, a pointer to the sfp_bus structure, * %NULL if no SFP is specified, -@@ -461,9 +469,7 @@ static void sfp_upstream_clear(struct sf +@@ -536,9 +544,7 @@ static void sfp_upstream_clear(struct sf * %-ENOMEM if we failed to allocate the bus. * an error from the upstream's connect_phy() method. */ @@ -117,7 +117,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> { struct fwnode_reference_args ref; struct sfp_bus *bus; -@@ -481,7 +487,39 @@ struct sfp_bus *sfp_register_upstream_no +@@ -556,7 +562,39 @@ struct sfp_bus *sfp_register_upstream_no if (!bus) return ERR_PTR(-ENOMEM); @@ -157,7 +157,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> bus->upstream_ops = ops; bus->upstream = upstream; -@@ -494,33 +532,33 @@ struct sfp_bus *sfp_register_upstream_no +@@ -569,33 +607,33 @@ struct sfp_bus *sfp_register_upstream_no } rtnl_unlock(); |