diff options
| author | David S. Miller <davem@davemloft.net> | 2022-10-19 14:01:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-10-19 14:01:08 +0100 |
| commit | ac3208fbac43a41e2aec94ca382dff43c7ee7323 (patch) | |
| tree | cce58755e1af9f001006e3ab54ce1549e0148477 /tools | |
| parent | 5cacb2c7c9a4035238cbd7cbd3cf751f825d9f90 (diff) | |
| parent | d1942cd47dbdfb5a6187f660418a4e1be38d1312 (diff) | |
Merge branch 'net-bridge-mc-cleanups'
Ido Schimmel says:
====================
bridge: A few multicast cleanups
Clean up a few issues spotted while working on the bridge multicast code
and running its selftests.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/net/forwarding/bridge_igmp.sh | 3 | ||||
| -rwxr-xr-x | tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/selftests/net/forwarding/bridge_igmp.sh b/tools/testing/selftests/net/forwarding/bridge_igmp.sh index 1162836f8f32..2aa66d2a1702 100755 --- a/tools/testing/selftests/net/forwarding/bridge_igmp.sh +++ b/tools/testing/selftests/net/forwarding/bridge_igmp.sh @@ -96,9 +96,6 @@ cleanup() switch_destroy - # Always cleanup the mcast group - ip address del dev $h2 $TEST_GROUP/32 2>&1 1>/dev/null - h2_destroy h1_destroy diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh index 8748d1b1d95b..72dfbeaf56b9 100755 --- a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh +++ b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh @@ -59,6 +59,9 @@ switch_create() switch_destroy() { + tc qdisc del dev $swp2 clsact + tc qdisc del dev $swp1 clsact + ip link set dev $swp2 down ip link set dev $swp1 down |