selftests: mptcp: move prefix tests of addr_nr_ns2 together

Move the fullmesh prefix test of addr_nr_ns2 together with its other
prefix tests.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index ff83ef4..2957fe4 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -706,6 +706,7 @@ do_transfer()
                addr_nr_ns1=${addr_nr_ns1:10}
        fi
 
+       local flags="subflow"
        if [[ "${addr_nr_ns2}" = "fastclose_"* ]]; then
                # disconnect
                extra_args="$extra_args -I ${addr_nr_ns2:10}"
@@ -713,6 +714,9 @@ do_transfer()
        elif [[ "${addr_nr_ns2}" = "userspace_"* ]]; then
                userspace_pm=1
                addr_nr_ns2=${addr_nr_ns2:10}
+       elif [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
+               flags="${flags},fullmesh"
+               addr_nr_ns2=${addr_nr_ns2:9}
        fi
 
        if [ $userspace_pm -eq 1 ]; then
@@ -832,12 +836,6 @@ do_transfer()
                fi
        fi
 
-       local flags="subflow"
-       if [[ "${addr_nr_ns2}" = "fullmesh_"* ]]; then
-               flags="${flags},fullmesh"
-               addr_nr_ns2=${addr_nr_ns2:9}
-       fi
-
        # if newly added endpoints must be deleted, give the background msk
        # some time to created them
        [ $addr_nr_ns1 -gt 0 ] && [ $addr_nr_ns2 -lt 0 ] && sleep 1