From nobody Thu Sep 18 04:23:47 2025 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E36D1C2B for ; Wed, 29 Mar 2023 13:18:29 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id r11so15669396wrr.12 for ; Wed, 29 Mar 2023 06:18:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680095908; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=44fGbCY24u87wLjYoFExhS5EC3vDBtvXOh8a554nITU=; b=NH+6akN1k+mAR7IZeGfjqwcCrqdjeJQKmIxyVRY6qQFNrN4wsjqBEv4k5Yc7qJgfVU fHbKa/AzRlgAcJBhiL9XxLt1XY8Lu+E1EO9T1Gv9iCAf8DMokGI8iiT7GeT+V0MOzQeY XEbE4megxlnyNl5tD5xyi3OKPuF7S68ZiYZiAyYz+upcB8dmPVEqH+4lMbvOkyPrdrTe SnNTVZKcX/zp7rHfzFqKx+tCLo0SjxWzGJ8m+gq/WNZ8lwxSR5HP6VUFtVo1inXxy6dv ykC0EZW9DGFdY9NssSo2fYYRGPWr1nANM5si3cElTjTh2VFVwOxX4DRgbzjPAyefFHE0 Q07Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680095908; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=44fGbCY24u87wLjYoFExhS5EC3vDBtvXOh8a554nITU=; b=sKg+1eak2uNcIJt2nUhRKOf//B06cxKE/z1DlRjmclXTXhAKF/EGm99T2AruZEMmZv gZejk7vuP+7LeHneEzu40CEABnZ4P7UX1lBiz1ZBCFVv12uHoYjJwBTpChe+1zXwgJb7 LjgCyuYcTVtwepJxalJIIhgvIOfBxwxZ3P0BMYHfiRosLJ+e1/w+Fm0ZmOTOIaBAEdfY EAB3/lSS50Z4Nyo4RaXrd2CCOZ33ZrcoCmkrAu5DdgQ2nqXKXvdBC8ltv1L/TK8pyaUf 7MMtNil2S9hjuTpx4rOqFvLvrN+faDJkaU8EC9I/6RfWGtCkBial9VtblX9ReiDbeG7y Chfw== X-Gm-Message-State: AAQBX9ey37bsOP0DGGIwVanqKNLpGR7bmjy5IIJzcBXfUFVEJ8HxeFdH 99DMydFoVNvvtV+Eom7IkvDkjiJ4X4FLLjadogZV3w== X-Google-Smtp-Source: AKy350ZOvzn7az3Zu7S1OEiCgVJPdK7IxF3SyDRaTZWtViRHJwSxDFIhGWPXb4JlWF2UkjnndmuFeg== X-Received: by 2002:a5d:4349:0:b0:2de:ffec:e48a with SMTP id u9-20020a5d4349000000b002deffece48amr9715881wrr.29.1680095908102; Wed, 29 Mar 2023 06:18:28 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id e13-20020a056000120d00b002d7a75a2c20sm22933678wrx.80.2023.03.29.06.18.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:18:27 -0700 (PDT) From: Matthieu Baerts Date: Wed, 29 Mar 2023 15:17:56 +0200 Subject: [PATCH mptcp-next 1/3] MAINTAINERS: add git trees for MPTCP Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230329-mptcp-misc-cleanups-v1-1-a839001f0b05@tessares.net> References: <20230329-mptcp-misc-cleanups-v1-0-a839001f0b05@tessares.net> In-Reply-To: <20230329-mptcp-misc-cleanups-v1-0-a839001f0b05@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=786; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=5DaZrzUJOO/c9rIfCNG4YTRDYuBszWkhQlenGgUtZVY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkJDqingks2CYUo7HcgbjE2nmCCJAem8AToepTn NYJO7gTYj+JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZCQ6ogAKCRD2t4JPQmmg c+8HEADcV9a514GOyWu0LUZYF5o6pEzxE+JbmPtvp6DeHy6m2c2Iql/TtSNmlNnN0XqkIhgFe3g 66QzCXF2kPPdPZlvmstOKBF1cxZcyiYNTmR31NTf4rhgdcK7Pdc2NaHA8ObYPcthe/pr//cvclD gSQKjek4QInrPHt/EXfqeys8v0TTlsVcYgybFcvO+qQoQrv4PcaL6YnJbumh/W5iY+9xVfxU3nn DOzzeRJBdHbQdwng25i+28ifwoJ8Px4WqBLTZbh6bPgydbsyjuFWUsH71H/cK3DWpdPb4ZB2c4v cqRvhM8Vv8Je9DOfcoX4ZF9MJI8yS0ePeA48+lMhe6DVvB8RaGL4qblv6bDcuwP6PBfLauXsCiX ewGrUVJdL+JmS8YtHUj6XQ6IfaroL4PJdLiwJWCJuuR4/HDWDygwRvdG+lVN9gcCQEdOrQlSUQc D3ni25uKdWIly/ioH3nEer9iUGdQlWMMlpMS9NjUTXmJMxWCmVXvyhFWZlSffEJDIYUuJWFcmvj I7NJmdMmZDghTrSqzOqsgdKJl6iXhCroInhso3NNg8BqAp0oKyHpXkhTIruFtc43zlMaFTUGzr8 R/wgCojazr1OXoJX8NO8IgQqwdN1cqj8s9UENfNGIYOJOVEKg/TICZBZSaMAAoT7AipWm2bL9Q7 bkR4CuFnlG7iHRQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 This will help occasional reviewers to find our git repo without having to look at the wiki. Signed-off-by: Matthieu Baerts Acked-by: Paolo Abeni --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 45fe6d7e918a..1b45ba8a1536 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14607,6 +14607,8 @@ L: mptcp@lists.linux.dev S: Maintained W: https://github.com/multipath-tcp/mptcp_net-next/wiki B: https://github.com/multipath-tcp/mptcp_net-next/issues +T: git https://github.com/multipath-tcp/mptcp_net-next.git export-net +T: git https://github.com/multipath-tcp/mptcp_net-next.git export F: Documentation/networking/mptcp-sysctl.rst F: include/net/mptcp.h F: include/trace/events/mptcp.h --=20 2.39.2 From nobody Thu Sep 18 04:23:47 2025 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E72A1C32 for ; Wed, 29 Mar 2023 13:18:30 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id e18so15678482wra.9 for ; Wed, 29 Mar 2023 06:18:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680095909; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NiLSryY6/Wq0AhQvPBGjPMa0MK9KMwgVs/2Ngs2rmEk=; b=5ALwImz/iPST55mnt5AE4SzZ2DZZIaZyLgeJM9wXHcDidQACVqS9WqE8Zsb+GJIYmy XzDEdfVzYyoe3UIJQs1FceptftPtxe5WndHBxd1vvTJ62uG7YVhSiyjqWsKzl9Sl09rx lnovyQG24IhYXwozJs1t+Dy9PTbVNCITZw1H0LlqHkhzVBQgqTVsCFVXDdNMsUfbZqjx n4ZxZCy5ulJqqRIqrWhvLxa49tCV99DkA1GRQAbE8O+sg7Ka8pmpNro0KARRkMa+VuGh BmiMBCX4neASMFd4ar6BvkwpyCw0Z9QiF89KvHG+EBF1iMkjaR468fFxOPVj/TAbQhM2 9Iyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680095909; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NiLSryY6/Wq0AhQvPBGjPMa0MK9KMwgVs/2Ngs2rmEk=; b=IxET/gEX3BRgiZuYgF8AP8Hbu6B0PIkUlyMCdwgbq0DvpTZtMQ5UN/ZeTkE7+LD7to DoVFHhOVHbgL8SlMce5PIogBmee2U3Zawrh/PWPEfOGE56DjU1SNgIqRWKStwT4kEQF8 jbmx2Q1ZuV8Jz6+oAuJWh1yvS+dva6Mt7O+pNN+GgpPz351RO9ETWH3MCNCjUpIWd974 sj2MXof9TGSLft3LfV4fZq7KSFNCqRew3YpUxMTRX6Ic4c1EZvlCw+z5ZzwwqJzqeXzT dh8S4uTwv62aLvbxNE7qZsK7Xjm9F2qqUKknqGEboLCFSYIhuOVBQW/BCotLTmIzKzyt I5vw== X-Gm-Message-State: AAQBX9fZV/xiIvzPO3YPPhahMAHvdjh7qcwpq5Jlj1MDuindJiGx+goz xp7TURG21avQ3SDsfgwdXtTlLKmNLn3F0On9BnI+qg== X-Google-Smtp-Source: AKy350ZLi+nidu2PefUpD2fOTu548LNVkBLaxPJ5wVAqyfNsDoxmFA5+4io5mys6dk3TC4qJgcu6EA== X-Received: by 2002:a5d:6e09:0:b0:2e4:cd4:f59a with SMTP id h9-20020a5d6e09000000b002e40cd4f59amr1171430wrz.26.1680095908879; Wed, 29 Mar 2023 06:18:28 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id e13-20020a056000120d00b002d7a75a2c20sm22933678wrx.80.2023.03.29.06.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:18:28 -0700 (PDT) From: Matthieu Baerts Date: Wed, 29 Mar 2023 15:17:57 +0200 Subject: [PATCH mptcp-next 2/3] mptcp: remove unused 'remaining' variable Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230329-mptcp-misc-cleanups-v1-2-a839001f0b05@tessares.net> References: <20230329-mptcp-misc-cleanups-v1-0-a839001f0b05@tessares.net> In-Reply-To: <20230329-mptcp-misc-cleanups-v1-0-a839001f0b05@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Abaci Robot , Mat Martineau , Jiapeng Chong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2483; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=2INg7m8zdyJ/qJzdop2FpEzxkvtqlBXbn9X3jI9J2nM=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkJDqiltsl3qTTZqoGZfkIXjCKwsUe48sfuCn9h 2ajIWgvFXSJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZCQ6ogAKCRD2t4JPQmmg cxZGEADuw0hejir9BiVjh4wqxGor+YyOzWo/qqAOaV4v2DvxZceqBpZh65o8rkj0vYCjpDDjpKb 2ptQD98T3PxPYE0hmcts34r8qryzvFsPELWHkTiIqDBPnW2GmqyWe6whHSqnl3d6NzHY5dLhiEM Xn7OiXAyvEmNQHISrE+16BfpdSwKRk+kA0v3N9i4uWbj8NZXZCxgOAd03yamU+6/+he09ht0a1d w9c6lIdZ2fB4g4z16YVHm7DtiVBbOBqYNUCfsoL707K3rhp6RzzPDqEy3nP5PhgUlOw5R/SZF6N K5Ia+w5ilDqaDuoJYhK9mNrmZw9xRU4/37UnDrzmw2ZFoqGFMPa271H83HAV+53qXBVYDf5uDEZ 6JNCPSEAQDNTj0MX2vbFHCi+j1Ngm5xN/ld3lKn18q9NVQsnjPdRJeDrbbQz6hull2cS6GOc0SJ qLqQV/R4PQB/LTpxHqsG1aoYq2+ttjk32HQktqyEbjcd0geDsPh/PuitHLHk6TD9BDMRWGCpv5t T5vQ+zBALD/yN+0D4PLi9DmmUFWSMgqYaLcDV1OjEO/T3b4VwZ039XAoyP+hrEFQatH+tbeFsLd BkZjaZFWnG/U+/yAy5DIa9PPIi3fjSOEpQ/Bkqf3eNzxFNdAOpFE8LpdLD/ZX2awEGFQSKP6REx UpWnyQpAcMsz+aA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 In some functions, 'remaining' variable was given in argument and/or set bu= t never read. net/mptcp/options.c:779:3: warning: Value stored to 'remaining' is never read [clang-analyzer-deadcode.DeadStores]. net/mptcp/options.c:547:3: warning: Value stored to 'remaining' is never read [clang-analyzer-deadcode.DeadStores]. Reported-by: Abaci Robot Suggested-by: Mat Martineau Co-developed-by: Jiapeng Chong Signed-off-by: Jiapeng Chong Signed-off-by: Matthieu Baerts Acked-by: Paolo Abeni --- net/mptcp/options.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index cd3b885c8faa..19a01b6566f1 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -442,7 +442,6 @@ static void clear_3rdack_retransmission(struct sock *sk) static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *= skb, bool snd_data_fin_enable, unsigned int *size, - unsigned int remaining, struct mptcp_out_options *opts) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); @@ -556,7 +555,6 @@ static void mptcp_write_data_fin(struct mptcp_subflow_c= ontext *subflow, static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff = *skb, bool snd_data_fin_enable, unsigned int *size, - unsigned int remaining, struct mptcp_out_options *opts) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); @@ -580,7 +578,6 @@ static bool mptcp_established_options_dss(struct sock *= sk, struct sk_buff *skb, opts->ext_copy =3D *mpext; } =20 - remaining -=3D map_size; dss_size =3D map_size; if (skb && snd_data_fin_enable) mptcp_write_data_fin(subflow, skb, &opts->ext_copy); @@ -851,9 +848,9 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, } =20 snd_data_fin =3D mptcp_data_fin_enabled(msk); - if (mptcp_established_options_mp(sk, skb, snd_data_fin, &opt_size, remain= ing, opts)) + if (mptcp_established_options_mp(sk, skb, snd_data_fin, &opt_size, opts)) ret =3D true; - else if (mptcp_established_options_dss(sk, skb, snd_data_fin, &opt_size, = remaining, opts)) { + else if (mptcp_established_options_dss(sk, skb, snd_data_fin, &opt_size, = opts)) { unsigned int mp_fail_size; =20 ret =3D true; --=20 2.39.2 From nobody Thu Sep 18 04:23:47 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 529591C3B for ; Wed, 29 Mar 2023 13:18:31 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id j24so15718795wrd.0 for ; Wed, 29 Mar 2023 06:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1680095909; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=MKPxVaCaUrmUbPN8pDxVsYQqvlfNNsMMuNiMHNFMngs=; b=I08HrYuvl3jMYd/0bHRhClR9cSxo4toO0JsibxSe8ZG4oZN1Efbp4ErkSVExVOZa0m ng9WLaNb4UW7d+uckQPAh20tQZ2mNV1ROwCamxMDSwV2earWzVFzcLBxV5wWSvM4z79g lUs9c+9dA6Nihg3I4kWC5+GlirWu/8Btcj9bwJoaNZF5zgXfrJ0QBIax+buPj7xwj9pJ nWI9t24Ti803svrmkBJqX7zX2Yiwd/gac9f6dmJbBWE+b36zljCLHswj3CpYQHsxr/iF s1k7syHV52Kx4MwX1zeh06M/vsIkC701mACPC4PCr2E0k+ZEx6YvrAshAEDgUw8rVQqt JfOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680095909; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MKPxVaCaUrmUbPN8pDxVsYQqvlfNNsMMuNiMHNFMngs=; b=WAnYbrSvFgvAGrvl6n6FhwXdheSdXfS1TsffwKGs4Gc4CAt8O1DEXU/2wagyNhDD0b JWJcnkzw/nmYNbTx3h47zCOuqx0vKEIktctOpjoZr7SXFrEcs6nFmQ1iqlvVO59wxi2O 7+zNg7chea1WWn0D8B13nzqC8k45gVzFXC7z3tL4/j00r1q44rJhqZBxpaa8xDPRSjhk ydhUxgFEMGVJhi09W/RaCk2+x6reE47iSILmesr5rtGZ89W2Kd7AWXEqdC345XnxklO0 fczDQKgZhpRlQ5M+qdoBB9ZLtQ0RJBGvnBVE5SzypvLMuB2e3bHnE8ykUsx6mC5rZ7Iv 94Og== X-Gm-Message-State: AAQBX9dSVWOwLches0rilaoYJkVRf00LbftywMOaouk+CbAPr2suf6Ac evh5jVaJO1jwCRS3y4syadJ7Iw== X-Google-Smtp-Source: AKy350ZTckh/ZVYmyd5JDHrT/xYTy/l6TkQbHEcKsNdDam92v0o9NRdO53DAaLuPh0ygWIuxOOrY4g== X-Received: by 2002:adf:e885:0:b0:2d0:835e:d73f with SMTP id d5-20020adfe885000000b002d0835ed73fmr16303657wrm.12.1680095909504; Wed, 29 Mar 2023 06:18:29 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id e13-20020a056000120d00b002d7a75a2c20sm22933678wrx.80.2023.03.29.06.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:18:29 -0700 (PDT) From: Matthieu Baerts Date: Wed, 29 Mar 2023 15:17:58 +0200 Subject: [PATCH mptcp-next 3/3] selftests: mptcp: remove duplicated entries in usage Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230329-mptcp-misc-cleanups-v1-3-a839001f0b05@tessares.net> References: <20230329-mptcp-misc-cleanups-v1-0-a839001f0b05@tessares.net> In-Reply-To: <20230329-mptcp-misc-cleanups-v1-0-a839001f0b05@tessares.net> To: mptcp@lists.linux.dev Cc: Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2642; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=Y+9qUJGqTfi5yFGOj9rCziZNuBnZH/yB4b9VFzBTrV0=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkJDqjWGgRG5t6M8ztQsyYI9N+pnapNVlvCnHOj vVlJ0RzrPuJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZCQ6owAKCRD2t4JPQmmg c1atEACGHqvQLIsikNITid2+j9utmv7jfXUVeMVpaDihqFDtuCrXu1dCiLFomOAQPaBAqmyIu5R gwDE/9LEFtCtKm4ccLxP2v39ZGkjPjaq0uH58mnmrNh1AxfqbDu8OxUDyOnf8LyMKlCPWvqr5ix 6M1yjisozYSDAa7st3jsOEkOOl6iJAZn4puS1utw662ksQEQpxJx2nEsbE/5w2dI3KPU2BZWVGJ g/rssBRGhmp120brOgZO0xll3R3ZooiKyQ/90hQh6/vmvZugCfcxPhRS+ZS24Shk4TR5VQYi0jf vDS3OsWz8RvrZTo/YssQlCnCI+A9ZOZ0rm1bYf8tJaoLIRX28BE3d2PAatZdWDv0Fpuzg/j9BBs UyAXwmOFQmUlMjoO7Kfme2Eiq1RzG5muwYPqNbpd9XVrYeXTLfqoa8ADwiDWz6fE22tqk0fMbac O6GV3Kz1a/Pj+0Lq8UebDb85sd31v6zyt3jkED2DCqSYcU4MSEYhzsOka01grOimzypPolU1DZB 0ZAJwodlfuQgNQ3/U90jcGBs2JvBsPv/otiX4brs3GUNw9tsMKbFo5roMwduHxV1j7OOYdedQbY vwjN+5mStLygxlsbo4GpgIBlKZtuvNzhFPyWZo/Xun6yYWmNxZUEq+xPADxsml35b8S0fZfPOOt Gx7bHJ6m2L9bpaQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 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 diff= erent 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. Signed-off-by: Matthieu Baerts Acked-by: Paolo Abeni --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index b25a31445ded..c7f9ebeebc2c 100644 --- 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] connec= t_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 \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); } --=20 2.39.2