Please update the commit log:
'''
This patch adds a selftest for userpsace PM to remove id 0 subflow. Use
userspace_pm_add_sf() to add a subflow, and pass initial ip address to
userspace_pm_rm_sf() to remove id 0 subflow.
When closing the initial subflow in __mptcp_close_ssk(), dispose_it is
false, then tcp_disconnect is invoked. This will send a MP_RST to close
a subflow on the peer too. So chk_rst_nr() is added in this test, and
chk_all_subflows after closing the initial subflow is '1 1', not '2 1'.
'''
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 33 +------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index b65a468e1ec5..9ffc8e061502 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1771,7 +1771,7 @@ chk_mptcp_info()
local cnt2
local dump_stats
- print_check "mptcp_info ${info1:0:14}=$exp1:$exp2"
+ print_check "mptcp_info ${info1:0:8}=$exp1:$exp2"
cnt1=$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1")
cnt2=$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2")
@@ -1792,37 +1792,6 @@ chk_mptcp_info()
fi
}
-# $1: subflows in ns1 ; $2: subflows in ns2
-# number of all subflows, including the initial subflow.
-chk_subflows_total()
-{
- local cnt1
- local cnt2
- local info="subflows_total"
-
- if [ $(ss -N $ns1 -inmHM | mptcp_lib_get_info_value $info $info) ]; then
- chk_mptcp_info $info $1 $info $2
- return
- fi
-
- print_check "$info $1:$2"
-
- cnt1=$(ss -N $ns1 -ti | grep -c tcp-ulp-mptcp)
- cnt2=$(ss -N $ns2 -ti | grep -c tcp-ulp-mptcp)
-
- if [ "$1" != "$cnt1" ] || [ "$2" != "$cnt2" ]; then
- fail_test "got subflows $cnt1:$cnt2 expected $1:$2"
- dump_stats=1
- else
- print_ok
- fi
-
- if [ "$dump_stats" = 1 ]; then
- ss -N $ns1 -ti
- ss -N $ns2 -ti
- fi
-}
-
chk_link_usage()
{
local ns=$1
--
2.35.3