aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-15 06:20:33 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 15:10:22 +0100
commita696e325f7a0ee386cd0c433f4bf2e30e9fc4b01 (patch)
tree2db37701195be5e689e0480a6de94fb0fd528d8e /target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
parent87def9efd8cee66da3bd3961671e580282427c2e (diff)
downloadupstream-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-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch b/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
index aec70e6d6f..7ddc5753f6 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0252-net-mscc-ocelot-don-t-hardcode-the-number-of-the-CPU.patch
@@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -1383,7 +1383,7 @@ static void ocelot_bridge_stp_state_set(
+@@ -1380,7 +1380,7 @@ static void ocelot_bridge_stp_state_set(
* a source for the other ports.
*/
for (p = 0; p < ocelot->num_phys_ports; p++) {
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
unsigned long mask = ocelot->bridge_fwd_mask & ~BIT(p);
for (i = 0; i < ocelot->num_phys_ports; i++) {
-@@ -1398,15 +1398,18 @@ static void ocelot_bridge_stp_state_set(
+@@ -1395,15 +1395,18 @@ static void ocelot_bridge_stp_state_set(
}
}