From nobody Mon Feb 9 14:38:17 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:3b21:0:0:0:0:0 with SMTP id c33csp1947513jaa; Wed, 2 Feb 2022 17:03:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzy75ZBXJP1L4mgN8QtdcxFNVLmf+kg6I5yo3qHwuRHdeMYtiR1QaTrvMhnjxIGIUsr7J48 X-Received: by 2002:a05:6a00:b85:: with SMTP id g5mr10551115pfj.27.1643850233702; Wed, 02 Feb 2022 17:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643850233; cv=none; d=google.com; s=arc-20160816; b=bBT4HnU/0WIaxyL075Bpo2TZeuBio7V0BOoc292nydzeqWwizkl636+dtWqx65m9io 6pHZJDFeGrA4l6HDlHcMIg3IQhQ3jKsaD1JZ82qsN1vQJuoFrllnlhNVxea0aJ8wRwq6 JfMV0DKCvoFDTT92cb+yl3NFfg2Sb119QWfym6xthv0oRoy2GOUVTQfrP0tAd4kKu8qa 78RxRYSjSXG127ioGVhjoXzoVftZUiew0BOKCYZC7N1XeGNuJtRh78ieYLA6tWstjbR1 xurGUbtwfpVHae7BbLx4uku2Rl6mK5Fs7xQfPGycm0owjux+GBR9Im34UmFveZ/e1fBo /XiA== 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=oE9o7UCu/G4twu4KaCGNJmPDXzkesPmvMz8eBXOBQp4=; b=zve2eMB81NZ3B9FqOigzI3oE6ezvW0rhJApmC0so7qEn3CetjmE+0mXEY+mOdiEfo8 4/RKdfqfjcD0E1pbMqC66jiuAUziu5SlgFcWyayzrJ6ftErVyugkhscZeLKRpIiw7ZeD B+9DsMZCwWVLrOQt3soFy8gVbXtoOBV29UDlwB07gf2rcSTqlh3pXV/QT7NyTb16kxSb 8hsSKELyxMnJGrYdyhghtPyV7E26vwRUYotd6b4MAQ3KLQYVA27kBwRVOsoZqstZKm+3 +EoSt/ONNMHefB14Gah8ywOFaA/OBfV27GoRfmu4mmU0KFGlQMzkFyP+N1cc81pcdPfM O2fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T2xV8xna; spf=pass (google.com: domain of mptcp+bounces-3410-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3410-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id k6si22086656pgs.247.2022.02.02.17.03.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Feb 2022 17:03:53 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3410-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=T2xV8xna; spf=pass (google.com: domain of mptcp+bounces-3410-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3410-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 469E73E0F6C for ; Thu, 3 Feb 2022 01:03:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D22442F3C; Thu, 3 Feb 2022 01:03:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 632472F27 for ; Thu, 3 Feb 2022 01:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643850231; x=1675386231; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/9eQohXqMEYwESVU7hdbMNneG33BX8HfDAWFeLSdjic=; b=T2xV8xnaAfdoDKGR7ZxYpLXGABHv1SqJgugMcJKoZqzFuxf0SfSpiXBB dY25DL4dYloWpczkhUq2bmGXAbSooEvb5g4o/yMbMb/Bqk6XO/AHTeAnn 8vCaDeuxC5FoHR1AHcA46DZ66NW78JyxJ7MJftpaCgMP2rrgK7KEqC5Hq NdtdyMR5bxvR5b5lMWrmT7zDSXySQ3AVIAS0CZgIBTquYiDbNF1cn6nH3 rRoybnPurcYaCnGA5rsSDghbdkvwH27GtzlVHZtZZ5/7fhtlcDCuvIZdx FQtTQEnGgEcyWvpA8Z8++IAsB1K6Tde33bIqNAiG4Ik83ICAY5T63mx5K A==; X-IronPort-AV: E=McAfee;i="6200,9189,10246"; a="228023382" X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="228023382" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2022 17:03:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="483070828" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.1.6]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2022 17:03:48 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 1/7] mptcp: move the declarations of ssk and subflow Date: Wed, 2 Feb 2022 17:03:37 -0800 Message-Id: <20220203010343.113421-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220203010343.113421-1-mathew.j.martineau@linux.intel.com> References: <20220203010343.113421-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 Move the declarations of ssk and subflow in MP_FAIL and MP_PRIO to the beginning of the function mptcp_write_options(). Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/options.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 645dd984fef0..5d0b3c3e4655 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1264,10 +1264,10 @@ static u16 mptcp_make_csum(const struct mptcp_ext *= mpext) void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, struct mptcp_out_options *opts) { - if (unlikely(OPTION_MPTCP_FAIL & opts->suboptions)) { - const struct sock *ssk =3D (const struct sock *)tp; - struct mptcp_subflow_context *subflow; + const struct sock *ssk =3D (const struct sock *)tp; + struct mptcp_subflow_context *subflow; =20 + if (unlikely(OPTION_MPTCP_FAIL & opts->suboptions)) { subflow =3D mptcp_subflow_ctx(ssk); subflow->send_mp_fail =3D 0; =20 @@ -1489,9 +1489,6 @@ void mptcp_write_options(__be32 *ptr, const struct tc= p_sock *tp, } =20 if (OPTION_MPTCP_PRIO & opts->suboptions) { - const struct sock *ssk =3D (const struct sock *)tp; - struct mptcp_subflow_context *subflow; - subflow =3D mptcp_subflow_ctx(ssk); subflow->send_mp_prio =3D 0; =20 --=20 2.35.1