From patchwork Fri Mar 1 18:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 208998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp63719dyc; Fri, 1 Mar 2024 10:19:40 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWtkGfEDjXiuoF0sR6X0ac6Gh9BZUJS5XFd5AizdCWasrvzuiQvbPRhEmBEJO0wj02mAhhECPkcREcqTT4825x6XsbeEQ== X-Google-Smtp-Source: AGHT+IGn21u9v+4EYNOkAKCTGlTqtDR4jIsdqR/qvlAYCKlMVBeQ11gVGmwMoQuOi467qlxd478A X-Received: by 2002:a17:906:fb15:b0:a44:9c44:8ed9 with SMTP id lz21-20020a170906fb1500b00a449c448ed9mr1719984ejb.5.1709317179947; Fri, 01 Mar 2024 10:19:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709317179; cv=pass; d=google.com; s=arc-20160816; b=dGLK0Xqo39+1lPGHxhBQJMNeN0w5iYjvU9PJxdY4DIyI4m3WXeTqiQzqQB4EyCWWPw Rq0XSOGqoqtMZY5BrDKQsgwJogvd1XapClcSI1vdSKTorRqYStHYZNVm66bynK/SeThw 685TCRLznTlaiWCriFUbm89NFXkv5pU0WImCcivW5+7MPea/+KAgAVF8RnE5tFhYCecg OJ2R5yMSC1eEkfxOlzn7DM4Wh7no5cMxLSRhQstVAniLibhNkZQylhkZfmhOGwhcavtk lm+3ilAj/4taLPHSBXVq35R9IRMcQPPfllDNYN+GY6i1uGekilOs7oF+ATsn+5ZaT2mq mVyg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=9oXYmtEOwEfFDoTf+qksFv7pGFb+US2DxRv0+UDqdZU=; fh=i1fHfqb3ms9PQICjX9LbYyHHX00fft5d6t57sCy1Fok=; b=AyzWSnqHxq39sm/+2V0WYO7cD/x0s6XSpLE5UvLJcLoag77qnNtkVQSS7WghP+ebAY TBINz4UFw4GxbIer/nR6bYNnxmMUkSncwZ9dW7prz1YH5/lPBfyb8SZzKDWhT6CPmA2B 7ADOpbftzyTpU061T7YOsapy904k4mrry2kNBdkf6slZTzUrjy1Lu8kXHtwGsoTqIQnB 25H3n/1NKhJjiuPHMURWW4OBcDGFFlZ4JSxedgAr/6zFvBX4rMsDCVuqAz32zx3DAlPZ DVricTETFM8RpjSakRiD/oNfAvDSj9aztRy+4020eClsvrf7oPGmyUYIKxbvdia4bQRk Mbdw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MGedMBzH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-88898-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88898-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id j24-20020a170906411800b00a448d9a8138si648309ejk.142.2024.03.01.10.19.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 10:19:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88898-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MGedMBzH; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-88898-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88898-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 911EF1F2374B for ; Fri, 1 Mar 2024 18:19:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 80FFC39ADB; Fri, 1 Mar 2024 18:18:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MGedMBzH" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACC9D38F9B; Fri, 1 Mar 2024 18:18:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709317115; cv=none; b=C7D9S5DuVlfyI/aGkASHPr5wLjAFjtfY92LTZvIEGKXCz4eV2mDk0aZV+TI3IqG4pBTgiIAnr//0R+l0+En5ak90FCXtPNklSOf1RBNNVKHTDp+XpH6yCiVmSYy0l5XMlPrmqTES04pOSUiet+KY3U+uAlbCIyxIJOduwc65vZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709317115; c=relaxed/simple; bh=nt6AK20BL5oE7VRdGXzhIfQmFT8Y3Oo0oEL80YyLgpA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CWCyv5n/G74BUBYkJLGipL94EOaAdK67/RQSs0IY1KElv7kb7ukXM+/zTfmZkPqoUfUOx2fRiowLsZGgURF7cTgjWDUjYrVNoLHI/EpeyRakqU/pi6It3DGIivJw8ffqw70giDSIn7N09mRpxsP9+14pK+2UG1F9mU6v6Oo1skU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MGedMBzH; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99129C43330; Fri, 1 Mar 2024 18:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709317115; bh=nt6AK20BL5oE7VRdGXzhIfQmFT8Y3Oo0oEL80YyLgpA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MGedMBzHzZeeUXKNXA4pbwd9tulDraVf9ElmbbZaX31Tu4/ngP3JM0xIIaWp0Akzm bpYi9Go0reS2dlilCOtLGjeYQnvOac0qLoiMR7ZJjNo2U4T9mATmx0f3NzW6F9tqwD wofrPNtqKC4UB5YszEGnF0RU0ZE1emVh76TbCS3ir3tyAeuziuUjrOtqmtwxYbALjR FCBSQ3lr9fTurFNlcEBWlOkEXiRjdcbGTzCZ9cBxrGwhadw1bv+k1YSeOUf1jHmIlA FFKogXZaAvBdz5+z3JQAhHOSzd46O/XxcLOWeMlQzxqgmntnzQfMC6Du9nqqs5hEZQ WTqQQ5uWLp8ZA== From: "Matthieu Baerts (NGI0)" Date: Fri, 01 Mar 2024 19:18:25 +0100 Subject: [PATCH net-next 01/15] mptcp: make pm_remove_addrs_and_subflows static Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-1-dc30a420b3a0@kernel.org> References: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-0-dc30a420b3a0@kernel.org> In-Reply-To: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-0-dc30a420b3a0@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: Geliang Tang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1808; i=matttbe@kernel.org; h=from:subject:message-id; bh=AYZiynLgRUai+yID1XvGhwLbyUgBmTsv+wmTY6d7j1k=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBl4hv0xChc9yYB8ar5v7m2sV4b4QOwB2y8ncWKi 5fPZzqqOZeJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZeIb9AAKCRD2t4JPQmmg cykdD/9zcobt34JTrByyeA1zmI504Wl+lTcEYdTDQKK2spFDNgy6NYB6b/Z5uCPGYZFzngjCAGb JSBKl/ze7FLssmtStNtKdxrGZdGVJsX/d+/jaKNpPETzlYiZz8DWldWF422PRHNVDOmOnCyba1R wDr1IT8/Nooh8hjzh4B7JjsErJLg9FODPalwCQ1SSAMEXS2Sj6Vf4StKlczQXik8E9YEeo9qgwh Uv2orFVmKdYxOWAcAR9nMBXienMI7BmtPBP7dTnHmHNJe3fOFNZQ/PVHm4NwPNDVJreha+WbE0h xt+RDPQqt/qZ54vd43IjF9gyrGaWD8dafn7OKNniVbhFWi+sVGTqCq9n/tNCUI7/TU6hh2ctp1I gsMi4CTxGlX5roM3FjcEh5mwOGNA+Qzw2FV0ks3TacRqlB52mZAXJKUoRQhbHD6JuCtlHFeTpgV DzYCA72293xIQ1SjKTmnv1/K3kH8DslE4Ss6OZAKYk2d4mI3vRn65qH14eItlNuKEUw8EJPnU+5 YxK4wuy7tNehndHBm2sop6DhV+TnCzOQLiJZ+Yc6GMZh6Xcg2fi6BuELjD9Wc/J5qNdjx0CoMId xUcR8fdPVUoTjdF8hzPBra1FWVxRcXWpa2gW3Pzov+SX74PSfRUrte/8bPaYmtK52n2jfG36Zxg IpjcdF96MdQfKsQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792348971295171627 X-GMAIL-MSGID: 1792348971295171627 From: Geliang Tang mptcp_pm_remove_addrs_and_subflows() is only used in pm_netlink.c, it's no longer used in pm_userspace.c any more since the commit 8b1c94da1e48 ("mptcp: only send RM_ADDR in nl_cmd_remove"). So this patch changes it to a static function. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index d5a942b9ab29..80c537659922 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1550,8 +1550,8 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list) } } -void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, - struct list_head *rm_list) +static void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, + struct list_head *rm_list) { struct mptcp_rm_list alist = { .nr = 0 }, slist = { .nr = 0 }; struct mptcp_pm_addr_entry *entry; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d0a7955b96c4..b85d1a8d111b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -959,8 +959,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list); -void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, - struct list_head *rm_list); void mptcp_free_local_addr_list(struct mptcp_sock *msk);