From: David Ahern Date: Wed, 1 Sep 2021 03:32:31 +0000 (-0600) Subject: Merge branch 'bridge-vlan-global-mcast' into next X-Git-Tag: v5.16.0~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb843668fbafe314edb0f99901565173b04976b8;p=thirdparty%2Fiproute2.git Merge branch 'bridge-vlan-global-mcast' into next Nikolay Aleksandrov says: ==================== This set adds support for vlan multicast options. The feature is globally controlled by a new bridge option called mcast_vlan_snooping which is added by patch 01. Then patches 2-5 add support for dumping global vlan options and filtering on vlan id. Patch 06 adds support for setting global vlan options and then patches 07-18 add all the new global vlan options, finally patch 19 adds support for dumping vlan multicast router ports. These options are identical in meaning, names and functionality as the bridge-wide ones. All the new vlan global commands are under the global keyword: $ bridge vlan global show [ vid VID dev DEVICE ] $ bridge vlan global set vid VID dev DEVICE ... I've added command examples in each commit message. The patch-set is a bit bigger but the global options follow the same pattern so I don't see a point in breaking them. All man page descriptions have been taken from the same current bridge-wide mcast options. The only additional iproute2 change which is left to do is the per-vlan mcast router control which I'll send separately. Note to properly use this set you'll need the updated kernel headers where mcast router was moved from a global option to per-vlan/per-device one (changed uapi enum which was in net-next). Example: # enable vlan mcast snooping globally $ ip link set dev bridge type bridge mcast_vlan_snooping 1 # enable mcast querier on vlan 100 $ bridge vlan global set dev bridge vid 100 mcast_querier 1 # show vlan 100's global options $ bridge -s vlan global show vid 100 port vlan-id bridge 100 mcast_snooping 1 mcast_querier 1 mcast_igmp_version 2 mcast_mld_version 1 mcast_last_member_count 2 mcast_last_member_interval 100 mcast_startup_query_count 2 mcast_startup_query_interval 3125 mcast_membership_interval 26000 mcast_querier_interval 25500 mcast_query_interval 12500 mcast_query_response_interval 1000 A following kernel patch-set will add selftests which use these commands. ==================== Signed-off-by: David Ahern --- fb843668fbafe314edb0f99901565173b04976b8