aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-01-27 09:41:12 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-01-29 14:22:09 +0100
commit2c35899d8196c3c4f02c9b788b99a8a3bbbb32d1 (patch)
treed7c1428523fa035cd8df33db81044878ea871354 /target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
parent7d12f29ae1d7337e4289baf9e6b4bf79445b0d59 (diff)
downloadupstream-2c35899d8196c3c4f02c9b788b99a8a3bbbb32d1.tar.gz
upstream-2c35899d8196c3c4f02c9b788b99a8a3bbbb32d1.tar.bz2
upstream-2c35899d8196c3c4f02c9b788b99a8a3bbbb32d1.zip
kernel: bump 5.4 to 5.4.93
All modification made by update_kernel.sh in a fresh clone without existing toolchains. Build system: x86_64 Build-tested: ipq806x/R7800, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 Compile-tested [*]: ath79/{tiny,generic}, ipq40xx, octeon, ramips/mt7621, realtek, x86/64 Run-tested [*]: ath79/generic, ipq40xx, octeon, ramips/mt7621 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> Tested-by: Stijn Segers <foss@volatilesystems.org> [*]
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch b/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
index 4ac2755159..2df6afb20b 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0247-net-mscc-ocelot-move-port-initialization-into-separa.patch
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -2137,6 +2137,28 @@ static int ocelot_init_timestamp(struct
+@@ -2135,6 +2135,28 @@ static int ocelot_init_timestamp(struct
return 0;
}
@@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int ocelot_probe_port(struct ocelot *ocelot, u8 port,
void __iomem *regs,
struct phy_device *phy)
-@@ -2144,7 +2166,6 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2142,7 +2164,6 @@ int ocelot_probe_port(struct ocelot *oce
struct ocelot_port_private *priv;
struct ocelot_port *ocelot_port;
struct net_device *dev;
@@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int err;
dev = alloc_etherdev(sizeof(struct ocelot_port_private));
-@@ -2172,32 +2193,14 @@ int ocelot_probe_port(struct ocelot *oce
+@@ -2170,32 +2191,14 @@ int ocelot_probe_port(struct ocelot *oce
ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, ocelot_port->pvid,
ENTRYTYPE_LOCKED);