netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] selftests: mptcp: fix typo in mptcp_connect usage
@ 2020-09-02 11:44 Davide Caratti
  2020-09-02 13:32 ` Matthieu Baerts
  2020-09-02 21:14 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Davide Caratti @ 2020-09-02 11:44 UTC (permalink / raw)
  To: mptcp, netdev; +Cc: Matthieu Baerts

in mptcp_connect, 's' selects IPPROTO_MPTCP / IPPROTO_TCP as the value of
'protocol' in socket(), and 'm' switches between different send / receive
modes. Fix die_usage(): swap 'm' and 's' and add missing 'sendfile' mode.

Signed-off-by: Davide Caratti <dcaratti@redhat.com>
---
 tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index 090620c3e10c..a54966531a64 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -65,8 +65,8 @@ static void die_usage(void)
 	fprintf(stderr, "\t-S num -- set SO_SNDBUF to num\n");
 	fprintf(stderr, "\t-R num -- set SO_RCVBUF to num\n");
 	fprintf(stderr, "\t-p num -- use port num\n");
-	fprintf(stderr, "\t-m [MPTCP|TCP] -- use tcp or mptcp sockets\n");
-	fprintf(stderr, "\t-s [mmap|poll] -- use poll (default) or mmap\n");
+	fprintf(stderr, "\t-s [MPTCP|TCP] -- use mptcp(default) or tcp sockets\n");
+	fprintf(stderr, "\t-m [poll|mmap|sendfile] -- use poll(default)/mmap+write/sendfile\n");
 	fprintf(stderr, "\t-u -- check mptcp ulp\n");
 	fprintf(stderr, "\t-w num -- wait num sec before closing the socket\n");
 	exit(1);
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next] selftests: mptcp: fix typo in mptcp_connect usage
  2020-09-02 11:44 [PATCH net-next] selftests: mptcp: fix typo in mptcp_connect usage Davide Caratti
@ 2020-09-02 13:32 ` Matthieu Baerts
  2020-09-02 21:14 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Matthieu Baerts @ 2020-09-02 13:32 UTC (permalink / raw)
  To: Davide Caratti; +Cc: mptcp, netdev

Hi Davide,

On 02/09/2020 13:44, Davide Caratti wrote:
> in mptcp_connect, 's' selects IPPROTO_MPTCP / IPPROTO_TCP as the value of
> 'protocol' in socket(), and 'm' switches between different send / receive
> modes. Fix die_usage(): swap 'm' and 's' and add missing 'sendfile' mode.

Good catch!

I guess we don't need this on -net or further, this test program is 
always used with its wrapper mptcp_connect.sh.

Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH net-next] selftests: mptcp: fix typo in mptcp_connect usage
  2020-09-02 11:44 [PATCH net-next] selftests: mptcp: fix typo in mptcp_connect usage Davide Caratti
  2020-09-02 13:32 ` Matthieu Baerts
@ 2020-09-02 21:14 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-09-02 21:14 UTC (permalink / raw)
  To: dcaratti; +Cc: mptcp, netdev, matthieu.baerts

From: Davide Caratti <dcaratti@redhat.com>
Date: Wed,  2 Sep 2020 13:44:24 +0200

> in mptcp_connect, 's' selects IPPROTO_MPTCP / IPPROTO_TCP as the value of
> 'protocol' in socket(), and 'm' switches between different send / receive
> modes. Fix die_usage(): swap 'm' and 's' and add missing 'sendfile' mode.
> 
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>

Applied, thank you.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-02 21:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02 11:44 [PATCH net-next] selftests: mptcp: fix typo in mptcp_connect usage Davide Caratti
2020-09-02 13:32 ` Matthieu Baerts
2020-09-02 21:14 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).