diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-06 00:46:27 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-07 20:42:34 +0200 |
| commit | 39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3 (patch) | |
| tree | 1af94a9d02252f72613b12dcbdeebd6cb6ffc04d /target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch | |
| parent | 3008f1f441a41e162311cee1ccadfdaaec1581c1 (diff) | |
| download | upstream-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-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch b/target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch index e710ed591b..e90977c602 100644 --- a/target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch +++ b/target/linux/generic/backport-5.4/781-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch @@ -22,11 +22,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org> net/dsa/switch.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) -diff --git a/net/dsa/switch.c b/net/dsa/switch.c -index 6a9607518823..dd71e3301b27 100644 --- a/net/dsa/switch.c +++ b/net/dsa/switch.c -@@ -65,19 +65,12 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds, +@@ -65,19 +65,12 @@ static int dsa_switch_bridge_join(struct return 0; } @@ -48,7 +46,7 @@ index 6a9607518823..dd71e3301b27 100644 /* If the bridge was vlan_filtering, the bridge core doesn't trigger an * event for changing vlan_filtering setting upon slave ports leaving * it. That is a good thing, because that lets us handle it and also -@@ -103,6 +96,26 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds, +@@ -103,6 +96,26 @@ static int dsa_switch_bridge_leave(struc if (err && err != EOPNOTSUPP) return err; } @@ -75,6 +73,3 @@ index 6a9607518823..dd71e3301b27 100644 return 0; } --- -2.34.1 - |