aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-04-06 00:46:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-07 20:42:34 +0200
commit39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3 (patch)
tree1af94a9d02252f72613b12dcbdeebd6cb6ffc04d /target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
parent3008f1f441a41e162311cee1ccadfdaaec1581c1 (diff)
downloadupstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.tar.gz
upstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.tar.bz2
upstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.zip
kernel: bump 5.4 to 5.4.188
Added the new configuration options: CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y Manually adapted: target/linux/generic/hack-5.4/220-gc_sections.patch Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch')
-rw-r--r--target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch b/target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
index a5f37457c7..983cc454e8 100644
--- a/target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
+++ b/target/linux/generic/backport-5.4/781-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
@@ -39,11 +39,9 @@ Signed-off-by: Marek BehĂșn <kabel@kernel.org>
net/dsa/switch.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/net/dsa/switch.c b/net/dsa/switch.c
-index dd71e3301b27..f517d6d7efa2 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
-@@ -112,9 +112,11 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
+@@ -112,9 +112,11 @@ static int dsa_switch_bridge_leave(struc
ds->ops->crosschip_bridge_leave(ds, info->sw_index, info->port,
info->br);
@@ -58,6 +56,3 @@ index dd71e3301b27..f517d6d7efa2 100644
return 0;
}
---
-2.34.1
-