From patchwork Fri Apr 14 15:47:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 83500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp479202vqo; Fri, 14 Apr 2023 08:49:03 -0700 (PDT) X-Google-Smtp-Source: AKy350bfAl2dfZHK9qxy9yt5ce8mO8K7Jv/avxXQ+Vk+RYHHwxXJ/iO72DZO10nqqfyR7VHtNmkW X-Received: by 2002:a05:6a21:3283:b0:ec:885a:a056 with SMTP id yt3-20020a056a21328300b000ec885aa056mr6344596pzb.33.1681487343600; Fri, 14 Apr 2023 08:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487343; cv=none; d=google.com; s=arc-20160816; b=ipnP/uFxSiH9cIsVTry71DPKX9b/XJ4oah4XUdOmPklv5Dgi4ghEv1ttsBTdRuzVEu jHElBbFHeyB59SdkP9JCtqCU4CWZbxxwKZ2lvwtyOcUeJgd91jb3KZcRFTflFjjWybxZ sg/RqxDFnD2JJmHevc21zN93LlfyYTXfYw38UCynKc+TdzSJFeF/0ycXixB+TZ26sZDZ qLJGhOAGHSUbRYlPzaNIvkJpPbAI8bkmdl0KrWGYvLCFRRJnBkLHNnHrO/KXaJYV38JO GMICVZISGirw5aZiGA+S4D14pdW2vBzprugfK4Hrs9StRn/MEgZyLrfdBJxR7sBHYIEY PebA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=O+DYIjU6I16ahs9ojO7PJA1gBnyWy1b9YKTrLd6I+3A=; b=jh6s+ptvJTiSc4PE+h9/VyI+x3/9yPG17fX/RT71I7xkngWdmVIOAtzVqdFl2L752+ 6WC0Zaye699Vy66RlHJ7WKoy/71sD9eyEYqbncXSnewPRYNkUISKM1dic6VS1HQ5pMBv 1rbQEMekAY9uuSttvsV4R8YVR8sGzL5AnZjA9D2uGDlgj4wftHuWn1hyamscjvHg2Vh3 o/iPNzCcgXifz2SsZgL60uxG4pFD9DoFDrjO0O+BJXx8eclb6UYDBTmrs22HV8W43+ic da4uekFnpo8oi/9TO0tm9+bqSTh0/WiIVfyFdIcs7IulqkeKn9gwZsc6eqG7Sd1XT0KI YLUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=4ID7M5d6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a6546c3000000b0051392e74562si5050200pgr.141.2023.04.14.08.48.48; Fri, 14 Apr 2023 08:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=4ID7M5d6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229958AbjDNPr1 (ORCPT + 99 others); Fri, 14 Apr 2023 11:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbjDNPrZ (ORCPT ); Fri, 14 Apr 2023 11:47:25 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3EC9757 for ; Fri, 14 Apr 2023 08:47:22 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id l10-20020a05600c1d0a00b003f04bd3691eso20998902wms.5 for ; Fri, 14 Apr 2023 08:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681487241; x=1684079241; 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=O+DYIjU6I16ahs9ojO7PJA1gBnyWy1b9YKTrLd6I+3A=; b=4ID7M5d63Lb3U7c35N+eucaFO8dTtTHS8lYWblB4FRza6pUJTGJmd3nzaec0gS8Q+B TLzhYkH9y1XqUMh/KWndBHFwTnTNYY0kHrTkLjISs1JYMDZusFgKYwryZWS3U/2wolr2 B8g0Q/AYAiXuJ2IzbE5B6VfGxs7JPEbatfHjsOhRC7GmFhmCeED6xiZqZWGkuOhHTW1o WOaGTOfDfVCIli+JSAwKVCyrQFOTl4LJ9Sy5MmBygDk9p9gBXeeMPAFUk8JAeHap0i4y pO2HkCwMWi90oaOEMt/R5NXWK+aJsBYB6bNhLpHszpX8yAm9jqYuUrEMuVDFqPvAQu+o OuyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487241; x=1684079241; 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=O+DYIjU6I16ahs9ojO7PJA1gBnyWy1b9YKTrLd6I+3A=; b=ZO+FTC3+Xg6IBFj76aiAkGMIdzbW7NBlQWYjA3v154euZTZJxHuj3DCyLG3uEp95gy inqtg58r7S4YI4Rc2YExJVlA3MJxkV+sjv6U8VDa4B9uON7wTmo7OkMNFHpZzgrQhEbv W3HtUDYCxPOgZ8eiTEf7aTcijzFOewtpmQzxWa901HZv3gugcVBonmQhk65SRPJuyOeO y7udKuymw5kugRrugykcPe/8XoKGTEMVsAMFC6Qt2zNvoAGkuPnrFhP8rx1OFlksPF8I /32nyWkyqmZr1hI+9ZfBlbsDzQ/80HIIQDKfMB93EAdy2R61uyDCPt9ZSTuAytSRgXz+ 09BA== X-Gm-Message-State: AAQBX9egYlCQnKepDESqh/h6zD7bvKJ2yNdbvAUG5bWqvQMWoP2jXKM2 cT3DWdQOCY0cCSp7lQQphXHa5Q== X-Received: by 2002:a05:600c:204c:b0:3f0:aeac:2f9c with SMTP id p12-20020a05600c204c00b003f0aeac2f9cmr3054597wmg.7.1681487240924; Fri, 14 Apr 2023 08:47:20 -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 x2-20020a05600c21c200b003f149715cb6sm1034298wmj.10.2023.04.14.08.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:47:20 -0700 (PDT) From: Matthieu Baerts Date: Fri, 14 Apr 2023 17:47:06 +0200 Subject: [PATCH net-next 1/5] mptcp: make userspace_pm_append_new_local_addr static MIME-Version: 1.0 Message-Id: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-1-5aa4a2e05cf2@tessares.net> References: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> In-Reply-To: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Matthieu Baerts , Geliang Tang X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1836; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=xn6nYYGzn0RBwhlUBtEUuUOZaLPe5YmFSoe6Y1JgLjw=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkOXWGV0Q+whOEFb9TdMJNNgfTb7WByJGEl3RHb c8yjkzLtw+JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDl1hgAKCRD2t4JPQmmg c4uHD/96LwkaJxFO1uZFMjroUmhb7BYvg14lCgz5jkWQLzcMb773Z3WawsSeohAZwLXdV6wEAPf 2iSgOnnzRHYZ1qKWnyfjKDGsuGmBcnJ4AtNhpIabkeivgab65SjSfzKpOpJ9izwn/b9lGbYK/fN Z5a/81WpeBsfhH7ZPdheta7cOdi4OzZeXTanZfnynlSUz6LdW+AGp15Fkctz3m+rmjpvnUYFOAL DoJBkYe8NhAYl2TBZk0EW3LWiYuogrI04ZUe4Q0D/i20uvDWHBfVsHX9Un5JnGYSXviOxyf+pt2 XmZ16tCpecFjRPTS0oAqJ7pAEuzWffB5j/7/zndy/+0A/8nBeGOcVjySoMzMdhNH09ODAXGh/Dv kpMWXrRb7DdeHlzC2sNPSg55L7xpMM8+2xFNfFtJiaptqrg4uOECoLBy1S3X4WClmkPtjeO6Um/ 05psx+HYtz1/9ogjcyBC2bt7Usx8nJiMGFdu3mZ8jyWxBShVA6xA0Je8HQzABwk6r9u/7uIjpMc OPI59cMXC5+gOm1PsnkvFgj1c7OeI8VOToskDTMUogXTiiXMMUOWPd8+MR330bNbNF0E/qh/215 9vEX+k8CJyZqgwF0UlSrBroGnLTQZvduW2kgmogVBrtkWOP4m7ZMRhYAttho+k7EQzz9DkoaQ4M Wccq/XOL6KbbMaw== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763167272759450465?= X-GMAIL-MSGID: =?utf-8?q?1763167272759450465?= From: Geliang Tang mptcp_userspace_pm_append_new_local_addr() has always exclusively been used in pm_userspace.c since its introduction in commit 4638de5aefe5 ("mptcp: handle local addrs announced by userspace PMs"). So make it static. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts --- net/mptcp/pm_userspace.c | 4 ++-- net/mptcp/protocol.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index a02d3cbf2a1b..27a275805c06 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -25,8 +25,8 @@ void mptcp_free_local_addr_list(struct mptcp_sock *msk) } } -int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, - struct mptcp_pm_addr_entry *entry) +static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, + struct mptcp_pm_addr_entry *entry) { DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); struct mptcp_pm_addr_entry *match = NULL; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e1310bc113be..c8dd24feabef 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -830,8 +830,6 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list * void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); -int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, - struct mptcp_pm_addr_entry *entry); void mptcp_free_local_addr_list(struct mptcp_sock *msk); int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info); int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info); From patchwork Fri Apr 14 15:47:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 83501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp479241vqo; Fri, 14 Apr 2023 08:49:08 -0700 (PDT) X-Google-Smtp-Source: AKy350aa/s3cy3o6dhWGRI/8IgV0CZU2xO2Sg3RUkHNDq6r/vB0SjS9foophTeRF1Qd0/1ZVNatG X-Received: by 2002:a05:6a00:1146:b0:632:d45b:4d3e with SMTP id b6-20020a056a00114600b00632d45b4d3emr9208863pfm.2.1681487347784; Fri, 14 Apr 2023 08:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487347; cv=none; d=google.com; s=arc-20160816; b=dMg/gMhZfrVizkHwy2eNfQcu0wz78Mrb2IRCdHmdEX5/JF/M30Gp4+DlTAotNHy+Xo jsG0EjRpWVy8eg4LLvibKzmgiWxTDaWoECXKOURxNTEo+euOXoE/q/U+eWTToxjpu9nE v/0L65MHvJ2B410d+3VZifJiwUqciNMFBQsEsg9SeK+ND9T87Wkof0pP5NplTbD8ohJ3 k7R3nO8PXosWTG4cni2ON49N3OgVqkpJzKynTLkT0Ua7b5PERrRjeEOuuLu5A8HsCFdX xDoXwtjOlQn/sHekUauB3BQptvgofzxDMZZZzW+CZvUoAfHU+k973oFpBFYx1IBfpg72 caRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=ROAGH3/MLol0O8DposnZ2qSsZAiwA2IYVTP8Kksz9vY=; b=mSAUzVrt95b9ss1YU8txAkH354GCXMgoUFlWRIBqPQ2tTXlTM4J1H/eoyxfmPLnRzu sX0DIcUMmqnP9Cx+nWeZUzmaDfLLZh2U+j3b2uXrelPJj/eX7FXt/tz/Z4HtkOSQk6Lt mxw8B2mQLbZFCESg0PdodYMpRye9tRnndZWQmx+MG7jbCjruB8A0oZ37/ABpw7v1hsMy Cpy15m0HGRft48SmM+Y8HP1IR40cnncoS/+c3VpgLr6Q1w0j3qgAAGy8YyOa6ghz3hXR k2ALW4vWQ8GYuUNNYnYPfIUVz0qtXq0KSiouE89eWKexEtoKHlBnfMgXxkaKfKuByBya fEpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=BcU0vgNm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c25-20020aa79539000000b0063afe9f1fb1si4543726pfp.119.2023.04.14.08.48.53; Fri, 14 Apr 2023 08:49:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=BcU0vgNm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230296AbjDNPrb (ORCPT + 99 others); Fri, 14 Apr 2023 11:47:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230219AbjDNPrZ (ORCPT ); Fri, 14 Apr 2023 11:47:25 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54A6535AA for ; Fri, 14 Apr 2023 08:47:23 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id o6-20020a05600c4fc600b003ef6e6754c5so8351186wmq.5 for ; Fri, 14 Apr 2023 08:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681487242; x=1684079242; 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=ROAGH3/MLol0O8DposnZ2qSsZAiwA2IYVTP8Kksz9vY=; b=BcU0vgNmCs3O3nL1BJrMGOUPdysG0O8cCK20bn3jpxWDdSyEI6JuGHa6Y14UD9zkkL ExwC5v63owpHeh8GsdQW50p+FQtXVl8T9Hi140rk+/kth8L1Q7i5YBYERj/v9gFDFOOY /4kCV/MD7eW6DKH/cdxD1+xCM3krUxjztJk/WMaF38d7nuenxhcgRuDiIMCkP1kREvPy kcmREXKGNc5ziHg6gUPokyvTOcnO/L5cq0itR1xFrzh0R+lhtt6bKbQrD0/6+XU2mHk1 idLY7ji05pW+y5rFpohLiYrcAVtR2Ac62kbpXqEHxa9gk/ZslxZfyoj5m1mG7tK354T6 kz6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487242; x=1684079242; 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=ROAGH3/MLol0O8DposnZ2qSsZAiwA2IYVTP8Kksz9vY=; b=bwFt+kcAaEkc8ivdiYEeb33z5FBPQLp7RcSN1K+/RIYPyMbw8bmMQ2hBoCdMTXYCYE IBOn2G7hoMWfA6xPNx4AxysOhTWgyMTlGgcj82SJeA/Qu46me5y+bFgkzWpASvDR32/b S0M9Qt79b8lw52P0wdjXSyV2CrsRxiV/uVcCwP8+l57MANhX5LrlW9slYQJEMe/ldeNe YPBUtwzMjF37Rti/7LQ0RlxWwZl/p5t8+YLE4ybAl1F0UtZJ0207hCPyafHRn37fGF0L PptsO6dTeG6L1Tzj14bJDiERkZ+rd15qsfgaC0vyZw4EqXdTky5wYfRRRE5mFc5ppUp9 2djg== X-Gm-Message-State: AAQBX9dbL+tycyzfTmhMUiYokAdaXIE0X2RktQfHMrqB1ecTpFaREnxj iMpdudfTBYUdQ26151doliW2oA== X-Received: by 2002:a1c:7312:0:b0:3f0:9f9b:1665 with SMTP id d18-20020a1c7312000000b003f09f9b1665mr5195510wmb.3.1681487241751; Fri, 14 Apr 2023 08:47:21 -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 x2-20020a05600c21c200b003f149715cb6sm1034298wmj.10.2023.04.14.08.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:47:21 -0700 (PDT) From: Matthieu Baerts Date: Fri, 14 Apr 2023 17:47:07 +0200 Subject: [PATCH net-next 2/5] MAINTAINERS: add git trees for MPTCP MIME-Version: 1.0 Message-Id: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-2-5aa4a2e05cf2@tessares.net> References: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> In-Reply-To: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=830; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=vS/IFlxUvtKD47GgBJOfT3kDGNlgv5CC+NDxkpe5d+k=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkOXWGt+uBrmDtZZccm3vssXJRxb3/wgMKtBSBW qhi747VdSmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDl1hgAKCRD2t4JPQmmg c3uqD/wMCewm+HBVHMHDEX/wjw7fB1HzXE0Z3cLx2pd8dV25HH1vkE6HTBjRQtPa1/C0CsBlvG6 WjhkhaiwWzkQV/Yq8jMIILjYeOdsIY03vYRNZqaC4oQ6MCZ/kqCpuwAm7E/bobwxK4FGa6kXkOi LrdolWQ6B19d5Js+m+12T/wInvSNk0peB1dzMt/HqOqkMhJA5R4/OmXetgeLkoglQu4glLg2AKi WIVfaqiZ2a6RLT948YfRQDTwCevtQGD3LUrICilewOxgOqNsoNj/xAtcFKuhqFOQOCES9zZ6n8O Yf6CSQMeFPc2vhv1/BOHuINF7qUsgsCXxet6XQXGrRIXmuC/hwzO9Icv1uusIRm9wIoBYMqZX/A oAlYci8XierSHT5aWGSFR8yH1vp2tD1NOAWjymaEjKmul9uWM+4HgHvVn/XWHvWEdNpqYTnaWWE c/j3m28QlDSVr36S7/rUH21gxa5t8GXCehnKGduyxOY9h51WbHnCkReUOsd88LTICbXJJ03tDPH dtCyE5fv2dukcogwD9Yb+ZbhnViqhQMRPJb4SbyZTPq5vUBCjuEPgO8Js7YQIBcXbEG8/cPDSec ZpMTdn8QgGCA5FM1TsMjMu6YlQgBUMJC0IRFsFztSeadzSCTusTjgSquhX7tOUjDLJJegHRp6GC JaCGmHDdXqRbD7g== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763167277482366385?= X-GMAIL-MSGID: =?utf-8?q?1763167277482366385?= This will help occasional developers to find our git repo without having to look at our wiki. Acked-by: Paolo Abeni Signed-off-by: Matthieu Baerts --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b8b275e27cdb..1c09473685b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14617,6 +14617,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 From patchwork Fri Apr 14 15:47:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 83504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp483428vqo; Fri, 14 Apr 2023 08:57:28 -0700 (PDT) X-Google-Smtp-Source: AKy350amjE2YU+TYlV+5HpOGuT3tGVnVENw2CBIt7cyxNcC9vPfY1IUFBJz7I4yCBlSCH3isZaye X-Received: by 2002:a05:6a20:549b:b0:ee:8fca:fe0c with SMTP id i27-20020a056a20549b00b000ee8fcafe0cmr1151827pzk.16.1681487848374; Fri, 14 Apr 2023 08:57:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487848; cv=none; d=google.com; s=arc-20160816; b=MsXub8+i8LTIRhUbgXtlKPE/ZXQZL7Mk+0GmExEo3Qb8KGgwbjoI7n7Xngi16EwQsl nnifqF5ylHW1/XWcJOQTPxilXptV7lWu5vlmToYcG4IHdmqtFXgML9YdlLsuKNdmdI11 9tFpFlNVbjKalRpgmABCBGtpcYEF1EZea42fs4HvGVcyILTqB9wv30Jb9HkZZ7ZeBu3l WhuWwrNY6OLdSWMRQQFOqIS9XAEZotauWUcZ+QRHcE3a6dgVShLNXWS1CCcPPV//xHpf K3X/qTLssjX8uVEDN6ofdIfLw3QtiwWzG8zx19b7udOe8rB77TENzn53itioVWD9keYQ Y3IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=lpfal81Z6EjmtDozR8H17bXhP01vB1EPYt1nMaTOgpk=; b=S229j1VMyBFIwF1+gsj8OJymLzS33DZLm80uTKiyqKXGZzAaYRWC+HQJvLHJqt8TDz 24q2PSuej/VHalYoI5y31S0ahq/fNP2PUcO5oD5rG3sYZLsi+TL4G0SMVfCMg5PdCBYt KHeNcXHe2RODFvV8WMqBDf8hOcU1pgAbFJ0dZvYdWh09SquFinu+YV0PDzYzA8TzltjN xsfOe/sIxhfy5Peyv3hDOtMLOKYYXp5Z5Rnh0W6knAviCoF9VreCWBg/AlWbu2KTeMVi JbxMKjUNQE/M1VMIS7yEEw2XWpvpLpkEn06UZDVXKfDPWtzRd5IK2DJWeBjp6BMP+Amx zGpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=BjHbrGR3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 14-20020a630e4e000000b005138574a0e8si4775361pgo.284.2023.04.14.08.57.15; Fri, 14 Apr 2023 08:57:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=BjHbrGR3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230421AbjDNPrl (ORCPT + 99 others); Fri, 14 Apr 2023 11:47:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230250AbjDNPr0 (ORCPT ); Fri, 14 Apr 2023 11:47:26 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66F86188 for ; Fri, 14 Apr 2023 08:47:24 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id s12so9498631wrb.1 for ; Fri, 14 Apr 2023 08:47:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681487243; x=1684079243; 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=lpfal81Z6EjmtDozR8H17bXhP01vB1EPYt1nMaTOgpk=; b=BjHbrGR353z8XzYk0NmEqBE4BXavNlUJuFfFmC68Ouil3tuI80t345U+ERJEZ/Nuol eu3nfrm1UsmMTeZEQCrkA/gqDFL7UpPw2pb/6EVtF8D+JU1fevLuzQsHX4nJUfA1rFL3 LbVu1Mukg8HB3EZsdHXdcGGQ4lXJjpSvime1S2/zK+K/mepEYy95F+p6kMbx+/+JM7qX J0/IcY+5TAZq3De4fSII9kpS171mUh9xNVSDgiX4apbuqE5j4q+VVyqhz4Q062hduw5f RXuayg5xTlu+oLLgxOtsKDThOaJe0QhY1bH/9Pnodswi9MJRcDy1dVO+L5Kxv9wOP/mt ndww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487243; x=1684079243; 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=lpfal81Z6EjmtDozR8H17bXhP01vB1EPYt1nMaTOgpk=; b=F78MY09ajNC4o+VpAovCpdDI7yLoGxn+YJpxDl9zYz3tW3E2tyQ8ApYQIsXXloCvp5 9KBwoesQOEqNONi6WXa+iyjRuWMDJwGCG6BCPb+uOkXDAocKZYb5xdPT/bjWvjAtTuGj Pz3MDwhdYdt92Hj1VboCqz7Y1N13ihAPTMkeL9uxjrobn5Y8ziRaoqMSljZ9/h32DeCg 9Ockwkfep3w7AT8+ZShriqbSjmmpG7zWYln192EOrxsJym5Tl0G0B8/LKNDNiZLjNBpV /4FDE5vNukIy2Ibt3xOjJF1vHSu12uNC/zUXF6emOyqEhbplo9Nfck8wFgSlUWR0Ri4b hDLA== X-Gm-Message-State: AAQBX9cyrQzk76Q+/DK0nk32dNzEHntpkov9WuIu/nBjf906PpnpoOXH JWGU/3CkEYq8OwjkC2PIf9PtB8qLGBWtDueDVEEYhg== X-Received: by 2002:a5d:4a08:0:b0:2f5:ac53:c04f with SMTP id m8-20020a5d4a08000000b002f5ac53c04fmr4271971wrq.28.1681487242678; Fri, 14 Apr 2023 08:47:22 -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 x2-20020a05600c21c200b003f149715cb6sm1034298wmj.10.2023.04.14.08.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:47:22 -0700 (PDT) From: Matthieu Baerts Date: Fri, 14 Apr 2023 17:47:08 +0200 Subject: [PATCH net-next 3/5] mptcp: remove unused 'remaining' variable MIME-Version: 1.0 Message-Id: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-3-5aa4a2e05cf2@tessares.net> References: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> In-Reply-To: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Matthieu Baerts , Abaci Robot , Mat Martineau , Jiapeng Chong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2584; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=gV1NcAY6/tnkKf9VWYi1pcEwxZE3vF9bAm0gXkwoyA0=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkOXWGmzpIRZ4fEeI/XlxK7M8E3sW44SLtFzFCe HKsivJpijGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDl1hgAKCRD2t4JPQmmg c8/QEACW882WEIPQ3ClfAl0TkV1bi26AGu5zGcgIICpo+6Q/BTNtG6Frl8WXegx6U8lRSx+LtCZ m4LhA/JDIhQBHUpNI7V6Q7bkB7cZWN7mugfV79O5Cpv7k3jxOvUW18dcXSAxiSb3oKfHpD24R8r G+5q0sirItKuWcZ2x6XQrCT/ForhoMRfDUGPvJnwpOrheZnTMXOw0hRW0y7ZBcbKnfHLPXInm6u jncpbEQuHJjMo3uEMzeTx4bJZk+ml4kfBPT7lu/ZSbLCQh+A4eOk1gKutvGnsADjnqgyuPki1TE 8xw3W1L6lN9si4uB1W9QjORPj+qlCVBcxHJ5h3mykGbqOy8dzvWyiSXIEaJWcZdkJmRJuVm5lWg gD3PtY5Ka+O0WukGMMEYaYYiBOKeryrydMdQ9Hti48K6TYN3HAO8hVlNtnNoYb53JgyaxfKILlu Q/7+JdLu+NlHTiVkmRAyk8Le5Ft8oMz9BMFdB23ck+v9IfFeWwywHt4aocx8UHsjUx1PQaKxqv3 fDgmkYc8YlbAyjggwO8ew5DmgGPzs6KgRfRWmYGzEbJPg7C4nuvRZzOEKn8OFkQxkEUyQPsPDgB 3HGLN7brliNO3C8uXWYe3uwIvz9nUXnszNCiyASJtz0IlypE245rbqYDxHDtW9BciMyrO6rU3GK WToe4Ewe7e85lmA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763167801728027096?= X-GMAIL-MSGID: =?utf-8?q?1763167801728027096?= In some functions, 'remaining' variable was given in argument and/or set but 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]. The issue has been reported internally by Alibaba CI. Reported-by: Abaci Robot Suggested-by: Mat Martineau Co-developed-by: Jiapeng Chong Signed-off-by: Jiapeng Chong Acked-by: Paolo Abeni Signed-off-by: Matthieu Baerts --- 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 355f798d575a..a9801cfe7d15 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 = mptcp_subflow_ctx(sk); @@ -556,7 +555,6 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *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 = mptcp_subflow_ctx(sk); @@ -580,7 +578,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, opts->ext_copy = *mpext; } - remaining -= map_size; dss_size = 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, } snd_data_fin = mptcp_data_fin_enabled(msk); - if (mptcp_established_options_mp(sk, skb, snd_data_fin, &opt_size, remaining, opts)) + if (mptcp_established_options_mp(sk, skb, snd_data_fin, &opt_size, opts)) ret = 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; ret = true; From patchwork Fri Apr 14 15:47:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 83505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp484364vqo; Fri, 14 Apr 2023 08:59:34 -0700 (PDT) X-Google-Smtp-Source: AKy350bGQuVZsDfFXvNkANm2yGdYPWf8pVuXCyGvyiqIEbsxPWLQnVTNoLG9p4KZZiowb919n/1F X-Received: by 2002:a05:6a20:8427:b0:ee:454f:11d8 with SMTP id c39-20020a056a20842700b000ee454f11d8mr3077033pzd.40.1681487974324; Fri, 14 Apr 2023 08:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487974; cv=none; d=google.com; s=arc-20160816; b=IbK9SdMmJXjJL8qKmLyurfWc/caejU4lvYZNEIeAfsQwie5gayPW/ZJUYXUITKD4Q/ +iSDuvtqGN/TMK0gwXSdr3fChFsSx7896sOChsanpA79os14yZ2yFaSwSQwu29oaDnkF 32QzCUWI4X5npv0j0mOStzWo4jB4MGWUjtzajGIREvPjd06+d6zJ0NGZsDevBte/OSPi 9d1y4ejo9LYf1ji1Tmg4Swm7vS83099I1fKSrYwgLFhHCTLwWyKr8tzFErtwrMRaSmbs 3RGL3HcxJK/ZlDT5PghPeDIIAYE+mGoap0xXDUJssBIIGRj8q+GoP3PISsNfAhc6Ljer ZNQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=IWDTtECwsAjmhmHRuxNIr9S2DI1LKdsoQ3rswGr32ds=; b=VIZcVgn6EFY87PWL4HYkZEw4fVtmBjXb/5tEXL41L2k0o5g+Sc0vx6DRSpPEfXDPqn SExCsYEZG/RCQl1CWM06XmUV1EEyNaX0B0Hrin1fjx8qmDR1SKuxgqT4hyLlaFfi13Y5 OhTP1ezI1GYMicOdZA6dUXKPCn3jR7PsdDlhRUiMDSnNsCIVonAEsw85wKLlCrcgqLdo sduoAK0KQnVLB8/Uprr91evbJEK0QbzL1s9qqn+CKybaAVz0+HplHZp6SI4CyjZ0TIsB hk6uCJnTsBFTjLPNpMOnR3ow7G6mEExQfFqiPjVjBbvAB5G2iwzHps13VYORdlx06pOa 4uOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=T2DCjD57; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l11-20020a654c4b000000b0051802927ee1si3106864pgr.330.2023.04.14.08.59.19; Fri, 14 Apr 2023 08:59:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=T2DCjD57; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230460AbjDNPrp (ORCPT + 99 others); Fri, 14 Apr 2023 11:47:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230254AbjDNPr0 (ORCPT ); Fri, 14 Apr 2023 11:47:26 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C5903C33 for ; Fri, 14 Apr 2023 08:47:25 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id bi22-20020a05600c3d9600b003f0ad935166so2683802wmb.4 for ; Fri, 14 Apr 2023 08:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681487243; x=1684079243; 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=IWDTtECwsAjmhmHRuxNIr9S2DI1LKdsoQ3rswGr32ds=; b=T2DCjD57aRc+HD2UC5CMLxlwCrnIpr+ZgwwhHPf3yqK/ASgz6n8armT5rL08ozQSSf b9S4kPyCVEM5sHxPm7hs1US6/AKSuj5KaKgVSw7ZB4nYPIj/fGdm+TNV5hub2G8ooQgW mSe9BnrVn19slUkgQHPoExUNRCxP9UzBLstdgWWzYbSqv2hWpyymlFiFSXXMHX9H216o 0x/i3UDr8/1WpdgwjZBFe1tE80AYJMpMb2I0QrDdoYDSS3qZrQ2lvaTUIkI38i56GNfF OMQ/BeFiqZnR74OCv4HM+mCjpN0REhuGkExModyFzrBJz8d3cShGkgyAOnjRxADTa1Mq wehg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487243; x=1684079243; 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=IWDTtECwsAjmhmHRuxNIr9S2DI1LKdsoQ3rswGr32ds=; b=QmFlESWV6Kwd6ZpIjAUxU8D3A+YmjztwaO/fiJ2YBCdCWZeaOYgA1O8sRirFHChgZL c89K7AgBZ+buj7MZSnORhzSRvrjIHNig8PjSbFtzVpA0pgQniYuxy3j4xOkHECLx0Bon nzOqYG9/h5+SfDwPnX11buKA6DkPKdHvGDrnNttXvRt0n7jRtcnmwQm5l6QzAh6BPKDd 9bq9R6eFox9655+rtyPQG7iOKCHZF8OK+0EPxGU99e/EHOK7hqbIE0pMLLC5n/aVENIu WR1bWCX2vI8E+6iLA9b8D4PmZmf9MYIEZ+nidnBst9ay2IxpDQTx9hSL+LaHXEAZNKek v0pw== X-Gm-Message-State: AAQBX9cEjWXancOlgw32XMm6lkL/EBcZL3Og8PzZJOBvoAMmJvXu7jez FzdeNfaNrCphdYe6IyQM6REfzw== X-Received: by 2002:a7b:c405:0:b0:3f1:4971:5cd0 with SMTP id k5-20020a7bc405000000b003f149715cd0mr1275134wmi.21.1681487243619; Fri, 14 Apr 2023 08:47:23 -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 x2-20020a05600c21c200b003f149715cb6sm1034298wmj.10.2023.04.14.08.47.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:47:23 -0700 (PDT) From: Matthieu Baerts Date: Fri, 14 Apr 2023 17:47:09 +0200 Subject: [PATCH net-next 4/5] selftests: mptcp: remove duplicated entries in usage MIME-Version: 1.0 Message-Id: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-4-5aa4a2e05cf2@tessares.net> References: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> In-Reply-To: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2688; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=OMhBvjHspE9kilhYpui/Ahqh9sFYY67x1kU+MoI9vh8=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkOXWGxSGApNnBsDJeBmCH9n9JpmD9H01vkQ0zT Ma71ppMdhKJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDl1hgAKCRD2t4JPQmmg c7HcD/9kxoAJMsr/I/X47DPp8WsaXxFjLUx49XD5Bb7xI2I2i3JLR3FBVv27Yhsxs8r980pmrvB 1yP5rjDuYTatbmW743zPNUhM7sdIZ+l9l4nUsx1ahei2sMJiQdqNaNKeWP7obQPUYHUIdY7Wm1K WkyCeecW4EZ7QdZxIi9ZDvQ5zA9BZsVPT1rWGZWequ2zJEEB6xPjDk10CZtCFNA6jb01M/tM2qf otZWbcWTjbEbuhfT4uQwIROVhRf7C7MJdZ/TfzLa1LI/fXyEnYEHUU8jpcZX4XI+Mu0aCreEAAQ VIgfd3gJ7J7WjZLNHKSz1Nvv//srNIuwqJG1GkaahiGc46n3Pr03aL7KfuBYWGjNv/VPoVseIV5 8u2tfDIB6yxMr/AmdVEYlEfgpw21QNkeM5A2BoTjqS5fgXUu9O4/hcd8dAgVjYuq5D/SVseuWRW WhLjCM37GE6UfzOq4EpLIMlcEZxq8Gn4WpZL6dt2BAaH5kao0f01lrFzLAXfbOhNViTWLdjlVMs OQZnvai2OPd8gDPL1I3AbrWD6fWMHs9DU5eB2VhcLF5BZg/XNUPr44ChzlumQZDzrLwzgNnFcpc onjrf5hhJJdXpAutmSzLhlA3hcIsuGNPb7JNksxTuZR+1/QcsHZg8RZ72gUTRRVDKJIJm8Ju6rT w+rT1AZepwycxEw== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763167934102458184?= X-GMAIL-MSGID: =?utf-8?q?1763167934102458184?= 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 Signed-off-by: Matthieu Baerts --- 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/testing/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] 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 \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); } From patchwork Fri Apr 14 15:47:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 83502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp479474vqo; Fri, 14 Apr 2023 08:49:35 -0700 (PDT) X-Google-Smtp-Source: AKy350YKzj30BAIEOFygLEm+bpR/dRLiSB/I3pE8+h+qz/PXwPW5g1Wzi9aimM63joZ+yo6oQ6sh X-Received: by 2002:a05:6a00:2283:b0:62d:e5eb:2d73 with SMTP id f3-20020a056a00228300b0062de5eb2d73mr9365367pfe.34.1681487375433; Fri, 14 Apr 2023 08:49:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487375; cv=none; d=google.com; s=arc-20160816; b=GPqTXCe0CITO0778Yflw8+0SCyChXggF7OFDNhBzwnlU+NgocO5aNe2kyCQybi9nzF ba1HiaJiB9ImGAIiTzHIAVyNe2aRrkzPjBacqCgTyypbjS8AvZqMjKn1lM/ZwVaUnW/+ IZUE4jDfxA6d23QG5RPneJbFkB7wORwsH7wTod5sURZnxqCdLZA7rZzkn3XUdxMq53tk ujSQd8nLxoKdxOyooJ5nC9Mx2GL017ZVJBsWHWUPKRobSalCdkZBWVwsTTRudiDagtOy UagwMV8CqkAncTlQeVTxZo9NrQP/nzmx/VzqA5mEHeuUifTahJAavksvQDNtZV1s5JWX pfwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Qzxt4XcM4tuKu37taRV5Ugjl1Cb3GZa6ByEPKZjvm68=; b=IAku5RrowUBWs6+SgMOFDwsPszpIee/KuI0JIvqg50huhlI0JSrTKJGCjiImkJbTos 9oAGPwnqJttiY4S6fx+J9VZE6/0QdKCfoYdzlSfehVgLXM9LXxcD+DYhaysAEpEW+CNG DDjTsJBuVzMTgCu8AZpz0BN+3dM2XJAyFiLd5xZTsh2KmaiJQmOV/3XBb7CVpuE3cMBk a4V8qirb0eG2vfgv/ecl4OUhezaCGJ0Lb1aOwcZD/y+Ndtt24u4SjHn/hsrNoHPfjmUk IZi/9aRxn8jijOFIq7bRHO4nRWKrva7g5IStpPjeGbZ8lsJFZsD2Vf8SwU4C3GpaKXyk xI5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=insrqgRz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s137-20020a632c8f000000b005004b2acf6dsi4820227pgs.810.2023.04.14.08.49.20; Fri, 14 Apr 2023 08:49:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=insrqgRz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjDNPrs (ORCPT + 99 others); Fri, 14 Apr 2023 11:47:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230231AbjDNPr1 (ORCPT ); Fri, 14 Apr 2023 11:47:27 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 208939757 for ; Fri, 14 Apr 2023 08:47:26 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id w24so8371744wra.10 for ; Fri, 14 Apr 2023 08:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681487244; x=1684079244; 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=Qzxt4XcM4tuKu37taRV5Ugjl1Cb3GZa6ByEPKZjvm68=; b=insrqgRzM5WggRlz8B5pv0UziSsf4Bk9QYU+AO+KzFAuqcBNEQfCS26+Tj+MjVpCPL uP4cMmOfcMIkznI9FbQi2i0ZqSSx1UFKdWnalX1Ug6m5PBIPJDQIFphg7yUxhEV2ivcD M9ofn6TCMlSEDu2NlD9l6W0zpNmlqjPG48oC5E9h6qNkuvq8EgkhkTf0ug4ZxZs7KyJ9 meB7e6gdS6S30/zAYV20930f0NRg/RqDN2wYo0qD2BrPx75U4pcQEcZUotJ2Zm55CSXX IO6Jt3pvubJmtlv0lwzX8KuSBplshzeXLXRhQOuoEs50g6VBfAqoL9gGomBhW4PAPCn3 seLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487244; x=1684079244; 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=Qzxt4XcM4tuKu37taRV5Ugjl1Cb3GZa6ByEPKZjvm68=; b=SixiqtF6JfI7SIwOdd/ddnWSKX1GPZ15c2E6rgjAr23Jil30UiksIwU/wjCI/pFegY +AROq55sr6U0Qrn+ZEOyT0sDfRyj+L69yajxYOfCfDUEauPsqxj9RZc7AbIcARF2+cun Dmi16+bPQAl956Zw6wi5nEXeKnX3qOULHedLnQRyKcYJC0lt3TVcBgSTMGhIiLxQFptV Sr3JPNEF+TXaIIpFD0vtqFyaf93rI6XwQAC6tDEivQ+Af3tCEAlXYsKrrcEaiZDZuy/H u0NmdzVIBgRwGkpuOjYj0tismWQpCNhxOMVRu1RY8uskkmWTRDhMahjG0zzJXodsWU7+ iAkA== X-Gm-Message-State: AAQBX9djNcJzcaNW0EFxeV/lFBl4W2UjEL0YlYpj2ZVQv241Uw/HqKNl Ow4wq+sRpvvYqR19ds7AL+WkQQ== X-Received: by 2002:adf:f709:0:b0:2f4:e8e3:ef62 with SMTP id r9-20020adff709000000b002f4e8e3ef62mr4561531wrp.65.1681487244500; Fri, 14 Apr 2023 08:47:24 -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 x2-20020a05600c21c200b003f149715cb6sm1034298wmj.10.2023.04.14.08.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 08:47:24 -0700 (PDT) From: Matthieu Baerts Date: Fri, 14 Apr 2023 17:47:10 +0200 Subject: [PATCH net-next 5/5] selftests: mptcp: join: fix ShellCheck warnings MIME-Version: 1.0 Message-Id: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-5-5aa4a2e05cf2@tessares.net> References: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> In-Reply-To: <20230414-upstream-net-next-20230414-mptcp-small-cleanups-v1-0-5aa4a2e05cf2@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Matthieu Baerts X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2487; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=5FlU9MokKUitrXSC9YGwxuWrLrcBCHiaj46QcbM+33c=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkOXWGyZxITuXwckR3HbIuXnkVm7W+wSc67dzLx OqLJqwqrtuJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZDl1hgAKCRD2t4JPQmmg c/XiEAC9N9r9lk1IJXEOk06iElSNPd4XvWvMdxKFRC8a5fiRwKfffWvBq83xIqjvPN6lDECghch CfAefrERTjAFWIxCED0YwWTaJVZPL7CTRv3gVQsmtwCmaJtkS9GgsHxdL3r0RrUfjRqH8ut/Qny K/3m2zTdH1tg/2vBHB/Dr2ojGfwPAQnyLoxtLKk58CFZkTgSGshZx66pjSYvoCM8HsHwx7fRi7r DueOR1eS1vGOO4aupDJApFqpDG/ezuNyrOhWfwpoQZX4eTYzky/g2ZHB1m+tjgvgbZc5898o6D6 j+Sw+5c/8/1EM5aZNcI3uQcIFgKFXQTFddSfuZn79KzBAdeo8qgOAUVzlLmz5fnJnqTaZiiJprD bjAQ01Yf0ADWyNM90DBOXG3GoVRYZdixwj5d6zGUmA81erWLFSChK34SDfulHISMbOvWjT5GXeX MRlzifdNAhXKtTbfm7r9zSg7lxBNdnqToMZnN07LX+DivSlR+tv2pjmK9k8P1fg+NSVRQrRo4IG YaMd4dgNsCCOdwzdic3nkmOvjfx5o6wyO3dLBBE8eFcwW3dLXQt0DRe3rRMN/ocQdWG3DUV4Pcs WRDOlOMJ4rBMfbcKDo4UkHyKa2pWSLiAdqztAQCLdUVev7wt3mfFKi8o6SGxzNvMjIDVEhwA/pa TCyicSCBV6Qm39Q== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763167306354019733?= X-GMAIL-MSGID: =?utf-8?q?1763167306354019733?= Most of the code had an issue according to ShellCheck. That's mainly due to the fact it incorrectly believes most of the code was unreachable because it's invoked by variable name, see how the "tests" array is used. Once SC2317 has been ignored, three small warnings were still visible: - SC2155: Declare and assign separately to avoid masking return values. - SC2046: Quote this to prevent word splitting: can be ignored because "ip netns pids" can display more than one pid. - SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. This probably didn't fix any actual issues but it might help spotting new interesting warnings reported by ShellCheck as just before, ShellCheck was reporting issues for most lines making it a bit useless. Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index fafd19ec7e1f..26310c17b4c6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -6,6 +6,10 @@ # address all other issues detected by shellcheck. #shellcheck disable=SC2086 +# ShellCheck incorrectly believes that most of the code here is unreachable +# because it's invoked by variable name, see how the "tests" array is used +#shellcheck disable=SC2317 + ret=0 sin="" sinfail="" @@ -371,8 +375,9 @@ check_transfer() local line if [ -n "$bytes" ]; then + local out_size # when truncating we must check the size explicitly - local out_size=$(wc -c $out | awk '{print $1}') + out_size=$(wc -c $out | awk '{print $1}') if [ $out_size -ne $bytes ]; then echo "[ FAIL ] $what output file has wrong size ($out_size, $bytes)" fail_test @@ -500,6 +505,7 @@ kill_events_pids() kill_tests_wait() { + #shellcheck disable=SC2046 kill -SIGUSR1 $(ip netns pids $ns2) $(ip netns pids $ns1) wait } @@ -1703,7 +1709,7 @@ chk_subflow_nr() cnt1=$(ss -N $ns1 -tOni | grep -c token) cnt2=$(ss -N $ns2 -tOni | grep -c token) - if [ "$cnt1" != "$subflow_nr" -o "$cnt2" != "$subflow_nr" ]; then + if [ "$cnt1" != "$subflow_nr" ] || [ "$cnt2" != "$subflow_nr" ]; then echo "[fail] got $cnt1:$cnt2 subflows expected $subflow_nr" fail_test dump_stats=1