From nobody Thu Sep 18 08:18:36 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp696941pis; Tue, 26 Apr 2022 14:57:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzJHcDt8u/npRuJ05MRyAL7vNUuKEouLs3aDy6P3FmqoG34fiM/KG0YKN135DAMYFaf6dd X-Received: by 2002:a05:6512:4021:b0:472:2513:4503 with SMTP id br33-20020a056512402100b0047225134503mr1176397lfb.357.1651010250588; Tue, 26 Apr 2022 14:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651010250; cv=none; d=google.com; s=arc-20160816; b=ThOAZjsB5sSCrgW7ZhSwGWa+Q1zNpXaMsndF21liXzlVZm3DFQ4+J6c3uygDbsFfG+ KwyNiA4ufe6IrivfIhviJyRv+ZCq8Ua+d2k3VyTcFB+giWhaT1sZSvsOsXMAj0ABaftl PjlQB88DkiDROsayV79MSxRNusK1cCq1RYwepF9RHSpRinkoMTphxAvYq0LkqM+zaqX2 l2OK0aucgAF77jwAAWA3fBkoAUzgVAEQmSFQFuz1gq4fAdWDrMxc0Ik4lwGSc8dy5qDP gH4iyjDKYqL2RpvZ0Kk6y/tNIfzf0ebvm55ZUy5oS9DqWXzV2qDoMLKxm78orO58Np2n 5R4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=4a8vvPz2EJac42g19PUWKrNojZY86huJAL0zh9fhKSM=; b=T+J17bvRqtOG8NOiyVYjmgWAW7kl164s9CpGxdJNhQepofJbfHqknqyHP5JNOk7MeG Xcm7x9HNtZsj3gFqHHQII1bAGnDqwWWbVI8hScRX1qc16/B2cg5RDLt9lhhOzq78x6Su Mczy7oIDbF9rSmQ+e/lWs87qQTRTZT3Uk17h3A/keH6yZHP+h14opfmDOkY0XJo7bfz/ o7bP9F+HhVIDLSpnpMk0LhbkLKtARoD3DiwRvgZoSIBpMsFcbsN0n1mr26mCpbKtN1N4 KXkqW91B3sk3pss4+MCcCcQTu1Q2pflJEptC1HC/z1oRrGN5hhWR9UBCNJqEQYPhJkkO uiPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O6dJ9Ap+; spf=pass (google.com: domain of mptcp+bounces-4901-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-4901-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id y7-20020a0565123f0700b0045dd8d9db7esi19154219lfa.595.2022.04.26.14.57.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2022 14:57:30 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4901-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O6dJ9Ap+; spf=pass (google.com: domain of mptcp+bounces-4901-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-4901-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 da.mirrors.kernel.org (Postfix) with ESMTPS id 0410A2E0A08 for ; Tue, 26 Apr 2022 21:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 63DFC33DD; Tue, 26 Apr 2022 21:57:27 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 257C633C3 for ; Tue, 26 Apr 2022 21:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651010246; x=1682546246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MhOYld/1XELXh4CJiXdT/E/wXr1i2B/WULJbFZ2W420=; b=O6dJ9Ap+Ig/eu/fCo4fxNPGQopKoLEFv7MUUaP/l8sIDxKueNJRl/gD1 1rZKm8Z4BxkbP4oDt9VPRBqtapf1R+YuuTaeiG+/ukq86caScIQzGFzSf X4+1LqSueatw/xCcnH6TyTNXp+hfYqZyf1osanQZiOIdKza47rs2avaUy fZIUxFqxCi9kqT230VQ6PxOuTvFBd+wuJ7CPPGG336eS2zqPbt1qv+mfq 7o0AucnrSEPSNsil5OKx5ggHbsQ3pz3c9slRmWDDb+CarJhqaQpR5YRrL sxlopHGNBj9QnLZkA4xGb+lBGlENOGyQX++X+8KoayydPMby2Jgrf7z4A Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="326222713" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="326222713" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 14:57:23 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="532878095" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.10.176]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2022 14:57:23 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 2/7] mptcp: use mptcp_stop_timer Date: Tue, 26 Apr 2022 14:57:12 -0700 Message-Id: <20220426215717.129506-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220426215717.129506-1-mathew.j.martineau@linux.intel.com> References: <20220426215717.129506-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use the helper mptcp_stop_timer() instead of using sk_stop_timer() to stop icsk_retransmit_timer directly. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4581c570ef68..e3db319ce92e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2753,7 +2753,7 @@ static void __mptcp_destroy_sock(struct sock *sk) /* join list will be eventually flushed (with rst) at sock lock release t= ime*/ list_splice_init(&msk->conn_list, &conn_list); =20 - sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer); + mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); msk->pm.status =3D 0; =20 @@ -2861,7 +2861,7 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE); } =20 - sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer); + mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); =20 if (mptcp_sk(sk)->token) --=20 2.36.0