[openwrt/openwrt] generic: 5.15: rework backport patch
LEDE Commits
lede-commits at lists.infradead.org
Sat Mar 26 21:19:39 PDT 2022
dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/fc8778981fb4240d87dec182181eff685dc76633
commit fc8778981fb4240d87dec182181eff685dc76633
Author: Ansuel Smith <ansuelsmth at gmail.com>
AuthorDate: Mon Mar 21 15:13:01 2022 +0100
generic: 5.15: rework backport patch
Rework backport patch for kernel 5.15.
Signed-off-by: Ansuel Smith <ansuelsmth at gmail.com>
---
...e-VLAN-filtering-syncing-out-of-dsa_switc.patch | 42 +++++++++++-----------
...void-cross-chip-syncing-of-VLAN-filtering.patch | 22 ++++++------
2 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/target/linux/generic/backport-5.15/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch b/target/linux/generic/backport-5.15/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
index eb60134a1e..c36b9e6a90 100644
--- a/target/linux/generic/backport-5.15/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
+++ b/target/linux/generic/backport-5.15/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
@@ -1,13 +1,7 @@
-From 7164a8cde4b42f76474088ccaf53f1e463d4e2f6 Mon Sep 17 00:00:00 2001
+From 381a730182f1d174e1950cd4e63e885b1c302051 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias at waldekranz.com>
Date: Mon, 24 Jan 2022 22:09:43 +0100
-Subject: [PATCH 5.10 1/2] net: dsa: Move VLAN filtering syncing out of
- dsa_switch_bridge_leave
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 381a730182f1d174e1950cd4e63e885b1c302051 upstream.
+Subject: net: dsa: Move VLAN filtering syncing out of dsa_switch_bridge_leave
Most of dsa_switch_bridge_leave was, in fact, dealing with the syncing
of VLAN filtering for switches on which that is a global
@@ -17,15 +11,16 @@ bugfix in the following commit.
Signed-off-by: Tobias Waldekranz <tobias at waldekranz.com>
Reviewed-by: Vladimir Oltean <olteanv at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
-Signed-off-by: Marek Behún <kabel at kernel.org>
---
- net/dsa/switch.c | 39 ++++++++++++++++++++++++++-------------
- 1 file changed, 26 insertions(+), 13 deletions(-)
+ net/dsa/switch.c | 38 +++++++++++++++++++++++++-------------
+ 1 file changed, 25 insertions(+), 13 deletions(-)
+diff --git a/net/dsa/switch.c b/net/dsa/switch.c
+index e3c7d2627a619..9f9b70d6070a3 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
-@@ -104,23 +104,12 @@ static int dsa_switch_bridge_join(struct
- return 0;
+@@ -113,25 +113,14 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds,
+ return dsa_tag_8021q_bridge_join(ds, info);
}
-static int dsa_switch_bridge_leave(struct dsa_switch *ds,
@@ -33,9 +28,11 @@ Signed-off-by: Marek Behún <kabel at kernel.org>
+static int dsa_switch_sync_vlan_filtering(struct dsa_switch *ds,
+ struct dsa_notifier_bridge_info *info)
{
- bool unset_vlan_filtering = br_vlan_enabled(info->br);
- struct dsa_switch_tree *dst = ds->dst;
- int err, i;
+ struct netlink_ext_ack extack = {0};
+ bool change_vlan_filtering = false;
+ bool vlan_filtering;
+ int err, port;
- if (dst->index == info->tree_index && ds->index == info->sw_index &&
- ds->ops->port_bridge_leave)
@@ -47,14 +44,13 @@ Signed-off-by: Marek Behún <kabel at kernel.org>
- info->sw_index, info->port,
- info->br);
-
- /* 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
-@@ -153,6 +142,30 @@ static int dsa_switch_bridge_leave(struc
- if (err && err != EOPNOTSUPP)
+ if (ds->needs_standalone_vlan_filtering && !br_vlan_enabled(info->br)) {
+ change_vlan_filtering = true;
+ vlan_filtering = true;
+@@ -172,6 +161,29 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
return err;
}
-+
+
+ return 0;
+}
+
@@ -78,6 +74,8 @@ Signed-off-by: Marek Behún <kabel at kernel.org>
+ if (err)
+ return err;
+
- return 0;
+ return dsa_tag_8021q_bridge_leave(ds, info);
}
+--
+cgit
diff --git a/target/linux/generic/backport-5.15/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch b/target/linux/generic/backport-5.15/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
index 0b36ef7cec..079ac7eb63 100644
--- a/target/linux/generic/backport-5.15/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
+++ b/target/linux/generic/backport-5.15/773-v5.18-2-net-dsa-Avoid-cross-chip-syncing-of-VLAN-filtering.patch
@@ -1,12 +1,7 @@
-From 6948a6654ffc878fc0258b363da77e7fd775b2d9 Mon Sep 17 00:00:00 2001
+From 108dc8741c203e9d6ce4e973367f1bac20c7192b Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias at waldekranz.com>
Date: Mon, 24 Jan 2022 22:09:44 +0100
-Subject: [PATCH 5.10 2/2] net: dsa: Avoid cross-chip syncing of VLAN filtering
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 108dc8741c203e9d6ce4e973367f1bac20c7192b upstream.
+Subject: net: dsa: Avoid cross-chip syncing of VLAN filtering
Changes to VLAN filtering are not applicable to cross-chip
notifications.
@@ -34,25 +29,28 @@ Fixes: d371b7c92d19 ("net: dsa: Unset vlan_filtering when ports leave the bridge
Signed-off-by: Tobias Waldekranz <tobias at waldekranz.com>
Reviewed-by: Vladimir Oltean <olteanv at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
-Signed-off-by: Marek Behún <kabel at 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 9f9b70d6070a3..517cc83d13cc8 100644
--- a/net/dsa/switch.c
+++ b/net/dsa/switch.c
-@@ -162,9 +162,11 @@ static int dsa_switch_bridge_leave(struc
+@@ -180,9 +180,11 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
info->sw_index, info->port,
- info->br);
+ info->bridge);
- err = dsa_switch_sync_vlan_filtering(ds, info);
- if (err)
- return err;
-+ if (dst->index == info->tree_index && ds->index == info->sw_index) {
++ if (ds->dst->index == info->tree_index && ds->index == info->sw_index) {
+ err = dsa_switch_sync_vlan_filtering(ds, info);
+ if (err)
+ return err;
+ }
- return 0;
+ return dsa_tag_8021q_bridge_leave(ds, info);
}
+--
+cgit
More information about the lede-commits
mailing list