From nobody Mon Feb 9 13:57:18 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2020382jad; Thu, 24 Feb 2022 15:22:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPfNmSrcSlmhoZ8BhJP+W1Zfqx3X1ZxvU44v3XAbpW2NHXvPB61EflwGRkVM/NY1BOFg9Q X-Received: by 2002:a17:902:8ec9:b0:14f:11f7:db77 with SMTP id x9-20020a1709028ec900b0014f11f7db77mr4597167plo.136.1645744953146; Thu, 24 Feb 2022 15:22:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645744953; cv=none; d=google.com; s=arc-20160816; b=ItwGKO5ky7+B/yOOEQL7lIizHOXNOsw5DIs97NW3K6NMSG4ADgXpp0cDyQ1PaCYk0v CeNL/5996svIoHbri49J7cQgF29UQF52gPW0RI/SR8MHHJcc267WYDxfzo/6VHU+DJLm yBmfge4SnSpVn9obxBNdJ0pdYi40ccbg/bj90DFegZqYjQ2yFMWk2UgUrEjd3tOX5Pfc +T3kofCLaNN0lCzJxBEsBKQUeR/GEVxJwcOcg9kMj+MRJ+x1lXF9n3GZjYg4eVXjyVp4 pjya7D8AyicE9bfTNTDcXhmChDTeqJ9nch+RXlRSs/ywStUC0EWykIn2UNpoDsQNAaAL 4Zmw== 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=66mNFf8viiPIvzB+UmVXsoKsriyrVtVe/Aue7hJAGLw=; b=XoT5OEZ1B0VmjgQd5WAxPcr1TA6TJWjs+1yvU1wZLholpBt6mu7dDk0nM/Tmv1lNqu SkdAAn3cBOfM3DXrv0iyGYMfWU3oFfddWEJVnTXSMyUUFw1eVg2+xM6gsaldwTnyA/7M iNM76GTVai/KqBJ+cADT8Lnu+txelQiJ4pOeT2wPsOJQxnm6XfnLtT11pcn7ygV/GRE0 8OCvSNZ5lyaU8MzfrNYbKqD1ZIiYBnjpwqKNNYfwlp92LDRjEZT9EyhmxIjVl1gYrrBh ide+cpWbmXqTMOOEM1gsl0gHHkP5cWBCThOgl9CG7eaff1S7Rua2swBRGNJjNW7xjnxL /HMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="mEfQ8P3/"; spf=pass (google.com: domain of mptcp+bounces-4027-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4027-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. [147.75.69.165]) by mx.google.com with ESMTPS id u2-20020a170903124200b001500760bfcesi380870plh.615.2022.02.24.15.22.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Feb 2022 15:22:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4027-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="mEfQ8P3/"; spf=pass (google.com: domain of mptcp+bounces-4027-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4027-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 68B303E0F0D for ; Thu, 24 Feb 2022 23:22:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6362F10E0; Thu, 24 Feb 2022 23:22:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 2E75D6ABC for ; Thu, 24 Feb 2022 23:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645744950; x=1677280950; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LWEmFrZ2U2Fi08dR/mdrOd+Y5WVaan8bzd0gJqYlgCE=; b=mEfQ8P3/cAfAr/6Gp0NcRdClM7dmQsw9R4sDBBfxWJuoc+sjkhnM9s16 4n6PzoNbz+kCdoYgeijQpw3M7OlSKQwY0Td/3yykllkXRPA0jR4oXyKXw j0XvR2eKP95VDqHWzgdsbJZ2T15GlhIyg/AzAbwrjZSXHEBUSy0hANCHH FTkrbVidZUAzLDC9SHx4SDhSQ3HH5xk3/Xjg35f0N/vKHYANOn2O71o2V ZGbZABV5sTIG/NsnvR/vboymhJOlzZANUZfnCq2Bq1mmsz00XHOo97Wd8 wdTj0Gvz5s9DgpiyJ84scmDCkZfP2/RGC4+j4XmjJohAMTjm/Zd0z4Zpe w==; X-IronPort-AV: E=McAfee;i="6200,9189,10268"; a="232998394" X-IronPort-AV: E=Sophos;i="5.90,134,1643702400"; d="scan'208";a="232998394" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Feb 2022 15:22:28 -0800 X-IronPort-AV: E=Sophos;i="5.90,134,1643702400"; d="scan'208";a="491784930" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.28.67]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Feb 2022 15:22:28 -0800 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau , fw@strlen.de Subject: [RFC PATCH mptcp-next 1/4] mptcp: Move some symbols to be visible outside the MPTCP subsystem Date: Thu, 24 Feb 2022 15:22:23 -0800 Message-Id: <20220224232226.259304-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220224232226.259304-1-mathew.j.martineau@linux.intel.com> References: <20220224232226.259304-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" Later patches will be checking MPTCP enabled status and a TCP option, so make those symbols available in TCP code. Signed-off-by: Mat Martineau --- include/net/mptcp.h | 18 ++++++++++++++++++ net/mptcp/protocol.h | 12 ------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index b8939d7ea12e..211f395d8139 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -16,6 +16,17 @@ struct mptcp_info; struct mptcp_sock; struct seq_file; =20 +/* MPTCP option subtypes */ +#define MPTCPOPT_MP_CAPABLE 0 +#define MPTCPOPT_MP_JOIN 1 +#define MPTCPOPT_DSS 2 +#define MPTCPOPT_ADD_ADDR 3 +#define MPTCPOPT_RM_ADDR 4 +#define MPTCPOPT_MP_PRIO 5 +#define MPTCPOPT_MP_FAIL 6 +#define MPTCPOPT_MP_FASTCLOSE 7 +#define MPTCPOPT_RST 8 + /* MPTCP sk_buff extension data */ struct mptcp_ext { union { @@ -100,6 +111,8 @@ extern struct request_sock_ops mptcp_subflow_request_so= ck_ops; =20 void mptcp_init(void); =20 +int mptcp_is_enabled(const struct net *net); + static inline bool sk_is_mptcp(const struct sock *sk) { return tcp_sk(sk)->is_mptcp; @@ -219,6 +232,11 @@ static inline void mptcp_init(void) { } =20 +static inline int mptcp_is_enabled(const struct net *net) +{ + return 0; +} + static inline bool sk_is_mptcp(const struct sock *sk) { return false; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7ec2513e1c2f..75c852f0dd3a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -36,17 +36,6 @@ #define OPTIONS_MPTCP_MPJ (OPTION_MPTCP_MPJ_SYN | OPTION_MPTCP_MPJ_SYNACK = | \ OPTION_MPTCP_MPJ_ACK) =20 -/* MPTCP option subtypes */ -#define MPTCPOPT_MP_CAPABLE 0 -#define MPTCPOPT_MP_JOIN 1 -#define MPTCPOPT_DSS 2 -#define MPTCPOPT_ADD_ADDR 3 -#define MPTCPOPT_RM_ADDR 4 -#define MPTCPOPT_MP_PRIO 5 -#define MPTCPOPT_MP_FAIL 6 -#define MPTCPOPT_MP_FASTCLOSE 7 -#define MPTCPOPT_RST 8 - /* MPTCP suboption lengths */ #define TCPOLEN_MPTCP_MPC_SYN 4 #define TCPOLEN_MPTCP_MPC_SYNACK 12 @@ -577,7 +566,6 @@ static inline void mptcp_subflow_delegated_done(struct = mptcp_subflow_context *su clear_bit(action, &subflow->delegated_status); } =20 -int mptcp_is_enabled(const struct net *net); unsigned int mptcp_get_add_addr_timeout(const struct net *net); int mptcp_is_checksum_enabled(const struct net *net); int mptcp_allow_join_id0(const struct net *net); --=20 2.35.1