@@ -263,8 +263,6 @@ setup_fou_or_gue() {
263263
264264 ${ns_a} ip link set ${encap} _a up
265265 ${ns_b} ip link set ${encap} _b up
266-
267- sleep 1
268266}
269267
270268setup_fou44 () {
@@ -302,6 +300,10 @@ setup_gue66() {
302300setup_namespaces () {
303301 for n in ${NS_A} ${NS_B} ${NS_R1} ${NS_R2} ; do
304302 ip netns add ${n} || return 1
303+
304+ # Disable DAD, so that we don't have to wait to use the
305+ # configured IPv6 addresses
306+ ip netns exec ${n} sysctl -q net/ipv6/conf/default/accept_dad=0
305307 done
306308}
307309
@@ -337,8 +339,6 @@ setup_vti() {
337339
338340 ${ns_a} ip link set vti${proto} _a up
339341 ${ns_b} ip link set vti${proto} _b up
340-
341- sleep 1
342342}
343343
344344setup_vti4 () {
@@ -375,8 +375,6 @@ setup_vxlan_or_geneve() {
375375
376376 ${ns_a} ip link set ${type} _a up
377377 ${ns_b} ip link set ${type} _b up
378-
379- sleep 1
380378}
381379
382380setup_geneve4 () {
@@ -588,8 +586,8 @@ test_pmtu_ipvX() {
588586 mtu " ${ns_b} " veth_B-R2 1500
589587
590588 # Create route exceptions
591- ${ns_a} ${ping} -q -M want -i 0.1 -w 2 -s 1800 ${dst1} > /dev/null
592- ${ns_a} ${ping} -q -M want -i 0.1 -w 2 -s 1800 ${dst2} > /dev/null
589+ ${ns_a} ${ping} -q -M want -i 0.1 -w 1 -s 1800 ${dst1} > /dev/null
590+ ${ns_a} ${ping} -q -M want -i 0.1 -w 1 -s 1800 ${dst2} > /dev/null
593591
594592 # Check that exceptions have been created with the correct PMTU
595593 pmtu_1=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${dst1} ) "
@@ -621,7 +619,7 @@ test_pmtu_ipvX() {
621619 # Decrease remote MTU on path via R2, get new exception
622620 mtu " ${ns_r2} " veth_R2-B 400
623621 mtu " ${ns_b} " veth_B-R2 400
624- ${ns_a} ${ping} -q -M want -i 0.1 -w 2 -s 1400 ${dst2} > /dev/null
622+ ${ns_a} ${ping} -q -M want -i 0.1 -w 1 -s 1400 ${dst2} > /dev/null
625623 pmtu_2=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${dst2} ) "
626624 check_pmtu_value " lock 552" " ${pmtu_2} " " exceeding MTU, with MTU < min_pmtu" || return 1
627625
@@ -638,7 +636,7 @@ test_pmtu_ipvX() {
638636 check_pmtu_value " 1500" " ${pmtu_2} " " increasing local MTU" || return 1
639637
640638 # Get new exception
641- ${ns_a} ${ping} -q -M want -i 0.1 -w 2 -s 1400 ${dst2} > /dev/null
639+ ${ns_a} ${ping} -q -M want -i 0.1 -w 1 -s 1400 ${dst2} > /dev/null
642640 pmtu_2=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${dst2} ) "
643641 check_pmtu_value " lock 552" " ${pmtu_2} " " exceeding MTU, with MTU < min_pmtu" || return 1
644642}
@@ -687,7 +685,7 @@ test_pmtu_ipvX_over_vxlanY_or_geneveY_exception() {
687685
688686 mtu " ${ns_a} " ${type} _a $(( ${ll_mtu} + 1000 ))
689687 mtu " ${ns_b} " ${type} _b $(( ${ll_mtu} + 1000 ))
690- ${ns_a} ${ping} -q -M want -i 0.1 -w 2 -s $(( ${ll_mtu} + 500 )) ${dst} > /dev/null
688+ ${ns_a} ${ping} -q -M want -i 0.1 -w 1 -s $(( ${ll_mtu} + 500 )) ${dst} > /dev/null
691689
692690 # Check that exception was created
693691 pmtu=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${dst} ) "
@@ -767,7 +765,7 @@ test_pmtu_ipvX_over_fouY_or_gueY() {
767765
768766 mtu " ${ns_a} " ${encap} _a $(( ${ll_mtu} + 1000 ))
769767 mtu " ${ns_b} " ${encap} _b $(( ${ll_mtu} + 1000 ))
770- ${ns_a} ${ping} -q -M want -i 0.1 -w 2 -s $(( ${ll_mtu} + 500 )) ${dst} > /dev/null
768+ ${ns_a} ${ping} -q -M want -i 0.1 -w 1 -s $(( ${ll_mtu} + 500 )) ${dst} > /dev/null
771769
772770 # Check that exception was created
773771 pmtu=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${dst} ) "
@@ -825,13 +823,13 @@ test_pmtu_vti4_exception() {
825823
826824 # Send DF packet without exceeding link layer MTU, check that no
827825 # exception is created
828- ${ns_a} ping -q -M want -i 0.1 -w 2 -s ${ping_payload} ${tunnel4_b_addr} > /dev/null
826+ ${ns_a} ping -q -M want -i 0.1 -w 1 -s ${ping_payload} ${tunnel4_b_addr} > /dev/null
829827 pmtu=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${tunnel4_b_addr} ) "
830828 check_pmtu_value " " " ${pmtu} " " sending packet smaller than PMTU (IP payload length ${esp_payload_rfc4106} )" || return 1
831829
832830 # Now exceed link layer MTU by one byte, check that exception is created
833831 # with the right PMTU value
834- ${ns_a} ping -q -M want -i 0.1 -w 2 -s $(( ping_payload + 1 )) ${tunnel4_b_addr} > /dev/null
832+ ${ns_a} ping -q -M want -i 0.1 -w 1 -s $(( ping_payload + 1 )) ${tunnel4_b_addr} > /dev/null
835833 pmtu=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${tunnel4_b_addr} ) "
836834 check_pmtu_value " ${esp_payload_rfc4106} " " ${pmtu} " " exceeding PMTU (IP payload length $(( esp_payload_rfc4106 + 1 )) )"
837835}
@@ -847,7 +845,7 @@ test_pmtu_vti6_exception() {
847845 mtu " ${ns_b} " veth_b 4000
848846 mtu " ${ns_a} " vti6_a 5000
849847 mtu " ${ns_b} " vti6_b 5000
850- ${ns_a} ${ping6} -q -i 0.1 -w 2 -s 60000 ${tunnel6_b_addr} > /dev/null
848+ ${ns_a} ${ping6} -q -i 0.1 -w 1 -s 60000 ${tunnel6_b_addr} > /dev/null
851849
852850 # Check that exception was created
853851 pmtu=" $( route_get_dst_pmtu_from_exception " ${ns_a} " ${tunnel6_b_addr} ) "
0 commit comments