[mptcp-next] Squash to "selftests: mptcp: add fullmesh testcases v4"

Commit Message

Geliang Tang July 27, 2021, 6:45 a.m. UTC

From: Geliang Tang <[e-mail]>

Update testcase 1.

Signed-off-by: Geliang Tang <[e-mail]>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Patch

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 9ceb6052b513..d87e7364dcea 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -325,13 +325,7 @@  do_transfer()
 	cpid=$!
 
 	if [ $addr_nr_ns1 -gt 0 ]; then
-		if [ $addr_nr_ns1 -gt 10 ]; then
-			let add_nr_ns1=addr_nr_ns1-10
-			flags=signal,fullmesh
-		else
-			let add_nr_ns1=addr_nr_ns1
-			flags=signal
-		fi
+		let add_nr_ns1=addr_nr_ns1
 		counter=2
 		sleep 1
 		while [ $add_nr_ns1 -gt 0 ]; do
@@ -341,7 +335,7 @@  do_transfer()
 			else
 				addr="10.0.$counter.1"
 			fi
-			ip netns exec $ns1 ./pm_nl_ctl add $addr flags $flags
+			ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal
 			let counter+=1
 			let add_nr_ns1-=1
 		done
@@ -1715,9 +1709,8 @@  fullmesh_tests()
 	reset
 	ip netns exec $ns1 ./pm_nl_ctl limits 8 8
 	ip netns exec $ns2 ./pm_nl_ctl limits 8 8
-	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,fullmesh
-	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
+	run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow
 	chk_join_nr "signal address fullmesh 1" 2 2 2
 	chk_add_nr 1 1