Commit 6c160b63 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

selftests: mptcp: update userspace pm subflow tests 

To align with what is done by the in-kernel PM, update userspace pm
subflow selftests, by sending the a remove_addrs command together
before the remove_subflows command. This will get a RM_ADDR in
chk_rm_nr().

Fixes: d9a4594e ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE")
Fixes: 5e986ec4 ("selftests: mptcp: userspace pm subflow tests")
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379


Cc: stable@vger.kernel.org
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24430f8b

tools/testing/selftests/net/mptcp/mptcp_join.sh

+2 −1
Original line number Diff line number Diff line
@@ -936,6 +936,7 @@ do_transfer() 
				sleep 1

				sp=$(grep "type:10" "$evts_ns2" |

				     sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')

				ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id

				ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \

									rip $da rport $dp token $tk

			fi
@@ -3150,7 +3151,7 @@ userspace_tests() 
		pm_nl_set_limits $ns1 0 1

		run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow

		chk_join_nr 1 1 1

		chk_rm_nr 0 1

		chk_rm_nr 1 1

		kill_events_pids

	fi

}