diff options
author | John Audia <graysky@archlinux.us> | 2021-12-15 06:20:33 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-17 15:10:22 +0100 |
commit | a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01 (patch) | |
tree | 2db37701195be5e689e0480a6de94fb0fd528d8e /target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch | |
parent | 87def9efd8cee66da3bd3961671e580282427c2e (diff) | |
download | upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.gz upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.bz2 upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.zip |
kernel: bump 5.4 to 5.4.165
All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/mt7621*
*FS#4149 affects me so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e
in order to downgrade to 2.35.1
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch b/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch index 4f5ab9ad5b..8fa0bca935 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0251-net-mscc-ocelot-split-assignment-of-the-cpu-port-int.patch @@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Set vlan ingress filter mask to all ports but the CPU port by * default. */ -@@ -2226,11 +2220,52 @@ int ocelot_probe_port(struct ocelot *oce +@@ -2223,11 +2217,52 @@ int ocelot_probe_port(struct ocelot *oce } EXPORT_SYMBOL(ocelot_probe_port); @@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ocelot->lags = devm_kcalloc(ocelot->dev, ocelot->num_phys_ports, sizeof(u32), GFP_KERNEL); -@@ -2310,13 +2345,6 @@ int ocelot_init(struct ocelot *ocelot) +@@ -2307,13 +2342,6 @@ int ocelot_init(struct ocelot *ocelot) ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_SRC + port); } @@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Allow broadcast MAC frames. */ for (i = ocelot->num_phys_ports + 1; i < PGID_CPU; i++) { u32 val = ANA_PGID_PGID_PGID(GENMASK(ocelot->num_phys_ports - 1, 0)); -@@ -2329,13 +2357,6 @@ int ocelot_init(struct ocelot *ocelot) +@@ -2326,13 +2354,6 @@ int ocelot_init(struct ocelot *ocelot) ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV4); ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV6); |