selftests: mptcp: remove duplicated entries in usage

mptcp_connect tool was printing some duplicated entries when showing how
to use it: -j -l -r

While at it, I also:

 - moved the very few entries that were not sorted,

 - added -R that was missing since
   commit 8a4b910d005d ("mptcp: selftests: add rcvbuf set option"),

 - removed the -u parameter that has been removed in
   commit f730b65c9d85 ("selftests: mptcp: try to set mptcp ulp mode in different sk states").

No need to backport this, it is just an internal tool used by our
selftests. The help menu is mainly useful for MPTCP kernel devs.

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index b25a31445ded3d05008260e1dcb6183a88d7a5b5..c7f9ebeebc2c5be3b30d6bbdab2313bb2e38fa54 100644 (file)
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -106,8 +106,8 @@ static struct cfg_sockopt_types cfg_sockopt_types;
 static void die_usage(void)
 {
        fprintf(stderr, "Usage: mptcp_connect [-6] [-c cmsg] [-f offset] [-i file] [-I num] [-j] [-l] "
-               "[-m mode] [-M mark] [-o option] [-p port] [-P mode] [-j] [-l] [-r num] "
-               "[-s MPTCP|TCP] [-S num] [-r num] [-t num] [-T num] [-u] [-w sec] connect_address\n");
+               "[-m mode] [-M mark] [-o option] [-p port] [-P mode] [-r num] [-R num] "
+               "[-s MPTCP|TCP] [-S num] [-t num] [-T num] [-w sec] connect_address\n");
        fprintf(stderr, "\t-6 use ipv6\n");
        fprintf(stderr, "\t-c cmsg -- test cmsg type <cmsg>\n");
        fprintf(stderr, "\t-f offset -- stop the I/O after receiving and sending the specified amount "
@@ -126,13 +126,13 @@ static void die_usage(void)
        fprintf(stderr, "\t-p num -- use port num\n");
        fprintf(stderr,
                "\t-P [saveWithPeek|saveAfterPeek] -- save data with/after MSG_PEEK form tcp socket\n");
-       fprintf(stderr, "\t-t num -- set poll timeout to num\n");
-       fprintf(stderr, "\t-T num -- set expected runtime to num ms\n");
        fprintf(stderr, "\t-r num -- enable slow mode, limiting each write to num bytes "
                "-- for remove addr tests\n");
        fprintf(stderr, "\t-R num -- set SO_RCVBUF to num\n");
        fprintf(stderr, "\t-s [MPTCP|TCP] -- use mptcp(default) or tcp sockets\n");
        fprintf(stderr, "\t-S num -- set SO_SNDBUF to num\n");
+       fprintf(stderr, "\t-t num -- set poll timeout to num\n");
+       fprintf(stderr, "\t-T num -- set expected runtime to num ms\n");
        fprintf(stderr, "\t-w num -- wait num sec before closing the socket\n");
        exit(1);
 }