drop queue-5.10/net-bridge-multicast-notify-switchdev-driver-whenever-mc-processing...

diff --git a/queue-5.10/net-bridge-multicast-notify-switchdev-driver-whenever-mc-processing-gets-disabled.patch b/queue-5.10/net-bridge-multicast-notify-switchdev-driver-whenever-mc-processing-gets-disabled.patch
deleted file mode 100644 (file)
index 6f74e58..0000000
--- a/queue-5.10/net-bridge-multicast-notify-switchdev-driver-whenever-mc-processing-gets-disabled.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c832962ac972082b3a1f89775c9d4274c8cb5670 Mon Sep 17 00:00:00 2001
-From: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
-Date: Tue, 15 Feb 2022 18:53:03 +0200
-Subject: net: bridge: multicast: notify switchdev driver whenever MC processing gets disabled
-
-From: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
-
-commit c832962ac972082b3a1f89775c9d4274c8cb5670 upstream.
-
-Whenever bridge driver hits the max capacity of MDBs, it disables
-the MC processing (by setting corresponding bridge option), but never
-notifies switchdev about such change (the notifiers are called only upon
-explicit setting of this option, through the registered netlink interface).
-
-This could lead to situation when Software MDB processing gets disabled,
-but this event never gets offloaded to the underlying Hardware.
-
-Fix this by adding a notify message in such case.
-
-Fixes: 147c1e9b902c ("switchdev: bridge: Offload multicast disabled")
-Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
-Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
-Link: https://lore.kernel.org/r/20220215165303.31908-1-oleksandr.mazur@plvision.eu
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/bridge/br_multicast.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/net/bridge/br_multicast.c
-+++ b/net/bridge/br_multicast.c
-@@ -77,6 +77,9 @@ __br_multicast_add_group(struct net_brid
- static void br_multicast_find_del_pg(struct net_bridge *br,
-                                    struct net_bridge_port_group *pg);
- 
-+static int br_mc_disabled_update(struct net_device *dev, bool value,
-+                               struct netlink_ext_ack *extack);
-+
- static struct net_bridge_port_group *
- br_sg_port_find(struct net_bridge *br,
-               struct net_bridge_port_group_sg_key *sg_p)
-@@ -1040,6 +1043,7 @@ struct net_bridge_mdb_entry *br_multicas
-               return mp;
- 
-       if (atomic_read(&br->mdb_hash_tbl.nelems) >= br->hash_max) {
-+              br_mc_disabled_update(br->dev, false, NULL);
-               br_opt_toggle(br, BROPT_MULTICAST_ENABLED, false);
-               return ERR_PTR(-E2BIG);
-       }

diff --git a/queue-5.10/series b/queue-5.10/series
index 48af4669f2195f1d8cfab76026fdbdb8b228de7b..549def33ea6af386b1b2d699dba971b3eca60d1b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -64,6 +64,5 @@ net_sched-add-__rcu-annotation-to-netdev-qdisc.patch
 bonding-fix-data-races-around-agg_select_timer.patch
 libsubcmd-fix-use-after-free-for-realloc-...-0.patch
 dpaa2-eth-initialize-mutex-used-in-one-step-timestamping-path.patch
-net-bridge-multicast-notify-switchdev-driver-whenever-mc-processing-gets-disabled.patch
 perf-bpf-defer-freeing-string-after-possible-strlen-on-it.patch
 selftests-exec-add-non-regular-to-test_gen_progs.patch