From: Nikolay Aleksandrov <[email protected]>
When I fixed IGMPv3/MLDv2 to use the bridge's multicast_membership_interval
value which is chosen by user-space instead of calculating it based on
multicast_query_interval and multicast_query_response_interval I forgot
to update the selftests relying on that behaviour. Now we have to
manually set the expected GMI value to perform the tests correctly and get
proper results (similar to IGMPv2 behaviour).
Fixes: fac3cb82a54a ("net: bridge: mcast: use multicast_membership_interval for
IGMPv3")
Signed-off-by: Nikolay Aleksandrov <[email protected]>
---
tools/testing/selftests/net/forwarding/bridge_igmp.sh | 3 +++
tools/testing/selftests/net/forwarding/bridge_mld.sh | 3 +++
2 files changed, 6 insertions(+)
diff --git a/tools/testing/selftests/net/forwarding/bridge_igmp.sh
b/tools/testing/selftests/net/forwarding/bridge_igmp.sh
index 675eff45b037..da031892ffd2 100755
--- a/tools/testing/selftests/net/forwarding/bridge_igmp.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_igmp.sh
@@ -483,9 +483,12 @@ v3exc_timeout_test()
# GMI should be 3 seconds
ip link set dev br0 type bridge mcast_query_interval 100
mcast_query_response_interval 100
+ ip link set dev br0 type bridge mcast_membership_interval 300
v3exclude_prepare $h1 $ALL_MAC $ALL_GROUP
ip link set dev br0 type bridge mcast_query_interval 500
mcast_query_response_interval 500
+ ip link set dev br0 type bridge mcast_membership_interval 1500
+
$MZ $h1 -c 1 -b $ALL_MAC -B $ALL_GROUP -t ip "proto=2,p=$MZPKT_ALLOW2"
-q
sleep 3
bridge -j -d -s mdb show dev br0 \
diff --git a/tools/testing/selftests/net/forwarding/bridge_mld.sh
b/tools/testing/selftests/net/forwarding/bridge_mld.sh
index ffdcfa87ca2b..96fdaa84606f 100755
--- a/tools/testing/selftests/net/forwarding/bridge_mld.sh
+++ b/tools/testing/selftests/net/forwarding/bridge_mld.sh
@@ -480,9 +480,12 @@ mldv2exc_timeout_test()
# GMI should be 3 seconds
ip link set dev br0 type bridge mcast_query_interval 100
mcast_query_response_interval 100
+ ip link set dev br0 type bridge mcast_membership_interval 300
mldv2exclude_prepare $h1
ip link set dev br0 type bridge mcast_query_interval 500
mcast_query_response_interval 500
+ ip link set dev br0 type bridge mcast_membership_interval 1500
+
$MZ $h1 -c 1 $MZPKT_ALLOW2 -q
sleep 3
bridge -j -d -s mdb show dev br0 \
--
2.31.1
