summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau2025-02-17 11:29:27 +0000
committerFelix Fietkau2025-02-17 11:30:12 +0000
commit38c21271d2b5749f135d662c2b28ef2bbdf607b8 (patch)
tree0c98b585330d3fc451d47d5f28a03332e1499074
parent51d485ef315c943885216865582741fe4bbdf633 (diff)
downloadopenwrt-38c21271d2b5749f135d662c2b28ef2bbdf607b8.tar.gz
kernel: receive all bridged multicast packets if IFF_ALLMULTI is set
Fixes issues with odhcpd, especially in relay mode Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--target/linux/generic/pending-6.6/642-net-bridge-locally-receive-all-multicast-packets-if-.patch24
-rw-r--r--target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch2
2 files changed, 25 insertions, 1 deletions
diff --git a/target/linux/generic/pending-6.6/642-net-bridge-locally-receive-all-multicast-packets-if-.patch b/target/linux/generic/pending-6.6/642-net-bridge-locally-receive-all-multicast-packets-if-.patch
new file mode 100644
index 0000000000..98edb315b1
--- /dev/null
+++ b/target/linux/generic/pending-6.6/642-net-bridge-locally-receive-all-multicast-packets-if-.patch
@@ -0,0 +1,24 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Mon, 17 Feb 2025 12:21:08 +0100
+Subject: [PATCH] net: bridge: locally receive all multicast packets if
+ IFF_ALLMULTI is set
+
+If multicast snooping is enabled, multicast packets may not always end up on
+the local bridge interface, if the host is not a member of the multicast
+group. Similar to how IFF_PROMISC allows all packets to be received locally,
+let IFF_ALLMULTI allow all multicast packets to be received.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -152,6 +152,8 @@ int br_handle_frame_finish(struct net *n
+ pkt_type = BR_PKT_MULTICAST;
+ if (br_multicast_rcv(&brmctx, &pmctx, vlan, skb, vid))
+ goto drop;
++ if (br->dev->flags & IFF_ALLMULTI)
++ local_rcv = true;
+ }
+ }
+
diff --git a/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index 96e1a19db4..31e29c447e 100644
--- a/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-6.6/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
-@@ -367,6 +367,8 @@ static rx_handler_result_t br_handle_fra
+@@ -369,6 +369,8 @@ static rx_handler_result_t br_handle_fra
fwd_mask |= p->group_fwd_mask;
switch (dest[5]) {
case 0x00: /* Bridge Group Address */