[PATCH mptcp-next] Squash to "selftests: mptcp: set fullmesh flag in pm_nl_ctl"

Geliang Tang posted 1 patch 2 years, 2 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/62353f253ecc5eb7724f0599cf1baf087e2cfa5a.1642662752.git.geliang.tang@suse.com
Maintainers: Mat Martineau <mathew.j.martineau@linux.intel.com>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Matthieu Baerts <matthieu.baerts@tessares.net>, Shuah Khan <shuah@kernel.org>
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 1 -
1 file changed, 1 deletion(-)
[PATCH mptcp-next] Squash to "selftests: mptcp: set fullmesh flag in pm_nl_ctl"
Posted by Geliang Tang 2 years, 2 months ago
Drop this mismatched comment.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index 9b6db9d77223..152b84e44d69 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -704,7 +704,6 @@ int set_flags(int fd, int pm_family, int argc, char *argv[])
 			if (++arg >= argc)
 				error(1, 0, " missing flags value");
 
-			/* do not support flag list yet */
 			for (str = argv[arg]; (tok = strtok(str, ","));
 			     str = NULL) {
 				if (!strcmp(tok, "backup"))
-- 
2.31.1


[PATCH mptcp-next] Squash to "selftests: mptcp: add backup with port testcase"
Posted by Geliang Tang 2 years, 2 months ago
'-z' is incorrect, use '-ne' instead.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index ba7025064fb6..ca6e47203455 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -500,7 +500,7 @@ do_transfer()
 						fi
 					fi
 				done
-				[ ! -z $port ]; _port="port $port"
+				if [ $port -ne 0 ]; then _port="port $port"; fi
 				ip netns exec $netns ./pm_nl_ctl set $addr flags $sflags $_port
 			done
 		done
-- 
2.31.1


[PATCH mptcp-next] Squash to "selftests: mptcp: add wrapper for setting flags"
Posted by Geliang Tang 2 years, 2 months ago
'-z' is incorrect, use '-ne' instead.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index f4efd18447c4..5cc892b350e0 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -397,7 +397,7 @@ pm_nl_change_endpoint()
 	if [ $ip_mptcp -eq 1 ]; then
 		ip -n $ns mptcp endpoint change id $id ${flags//","/" "}
 	else
-		[ ! -z $5 ]; port="port $5"
+		if [ $5 -ne 0 ]; then port="port $5"; fi
 		ip netns exec $ns ./pm_nl_ctl set $addr flags $flags $port
 	fi
 }
-- 
2.31.1