[PATCH mptcp-next v2] Squash to "selftests: mptcp: add the id argument for set_flags"

Geliang Tang posted 1 patch 2 years, 2 months ago
Failed in applying to current master (apply log)
tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[PATCH mptcp-next v2] Squash to "selftests: mptcp: add the id argument for set_flags"
Posted by Geliang Tang 2 years, 2 months ago
Update the usage of set_flags.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 v2:
    set [<ip>] [id <nr>] flags [[no]backup|[no]fullmesh] [port <nr>]
 ->
    set [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]
---
 tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index e554928487f8..22a5ec1e128e 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -28,8 +28,7 @@ static void syntax(char *argv[])
 	fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id <nr>] [dev <name>] <ip>\n");
 	fprintf(stderr, "\tdel <id> [<ip>]\n");
 	fprintf(stderr, "\tget <id>\n");
-	fprintf(stderr, "\tset [<ip>] [id <nr>] [flags backup|nobackup|fullmesh|nofullmesh]\n");
-	fprintf(stderr, "\t                                                     [port <nr>]\n");
+	fprintf(stderr, "\tset [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]\n");
 	fprintf(stderr, "\tflush\n");
 	fprintf(stderr, "\tdump\n");
 	fprintf(stderr, "\tlimits [<rcv addr max> <subflow max>]\n");
-- 
2.31.1


Re: [PATCH mptcp-next v2] Squash to "selftests: mptcp: add the id argument for set_flags"
Posted by Mat Martineau 2 years, 2 months ago
On Mon, 24 Jan 2022, Geliang Tang wrote:

> Update the usage of set_flags.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
> v2:
>    set [<ip>] [id <nr>] flags [[no]backup|[no]fullmesh] [port <nr>]
> ->
>    set [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]
> ---
> tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
> index e554928487f8..22a5ec1e128e 100644
> --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
> +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
> @@ -28,8 +28,7 @@ static void syntax(char *argv[])
> 	fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id <nr>] [dev <name>] <ip>\n");
> 	fprintf(stderr, "\tdel <id> [<ip>]\n");
> 	fprintf(stderr, "\tget <id>\n");
> -	fprintf(stderr, "\tset [<ip>] [id <nr>] [flags backup|nobackup|fullmesh|nofullmesh]\n");
> -	fprintf(stderr, "\t                                                     [port <nr>]\n");
> +	fprintf(stderr, "\tset [<ip>] [id <nr>] flags [no]backup|[no]fullmesh [port <nr>]\n");
> 	fprintf(stderr, "\tflush\n");
> 	fprintf(stderr, "\tdump\n");
> 	fprintf(stderr, "\tlimits [<rcv addr max> <subflow max>]\n");
> -- 
> 2.31.1

Thanks Geliang, you can roll this in with v3 of the "add the id argument 
for set_flags" series.

--
Mat Martineau
Intel