From 7a4d07ebffb577cb257bc62cbe0752e969bbbca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Sat, 5 Sep 2015 04:54:17 +0200 Subject: [PATCH] bridges: reenable multicast snooping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A few issues with the bridge snooping were identified and fixed upstream in OpenWRT: * "firewall: Allow IGMP and MLD input on WAN" (r45613) * "kernel: bridge: backport two snooping related patches" (r45783) * netifd: "bridge: Fix multicast_to_unicast feature by hairpin+isolate" (OW: "netifd: update to the latest version, adds multicast-to-unicast fixes" (r46719)) * "kernel: bridge, multicast-to-unicast: assign src after pskb_may_pull()" (r46721) * "kernel: bridge, multicast-to-unicast: fix echoes on STA" (46765) These have very likely caused issues with the bridge snooping before, which led to disabling it in the past. Let's reenable the multicast snooping now that they were fixed for reduced multicast overhead on the wifi. Signed-off-by: Linus Lüssing --- package/gluon-core/files/lib/gluon/upgrade/110-network | 3 ++- .../lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/gluon-core/files/lib/gluon/upgrade/110-network b/package/gluon-core/files/lib/gluon/upgrade/110-network index 2dc80be7..abe812a3 100755 --- a/package/gluon-core/files/lib/gluon/upgrade/110-network +++ b/package/gluon-core/files/lib/gluon/upgrade/110-network @@ -9,11 +9,12 @@ uci:section('network', 'interface', 'wan', { ifname = sysconfig.wan_ifname, type = 'bridge', - igmp_snooping = 0, peerdns = 0, auto = 1, } ) +uci:delete('network', 'wan', 'igmp_snooping') +uci:delete('network', 'wan', 'multicast_querier') if not uci:get('network', 'wan', 'proto') then uci:set('network', 'wan', 'proto', 'dhcp') diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh index 071bf9ff..c1b9737b 100755 --- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh +++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh @@ -44,7 +44,7 @@ if type(ifname) == 'string' then end end -uci:set('network', 'client', 'igmp_snooping', 0) +uci:delete('network', 'client', 'igmp_snooping') uci:set('network', 'client', 'macaddr', sysconfig.primary_mac) uci:set('network', 'client', 'peerdns', 1) uci:set('network', 'client', 'sourcefilter', 0)