From nobody Thu Sep 18 08:16:49 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2243142uau; Mon, 27 Jun 2022 18:03:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1um7BSFz1ZENbUv3+sOJKGtu1MWWHwBSfPp5TahpVYcSU8e/chqt9DrcQdiaWSskK6v7NMa X-Received: by 2002:a17:90a:b88c:b0:1ec:9449:219a with SMTP id o12-20020a17090ab88c00b001ec9449219amr23923684pjr.243.1656378183251; Mon, 27 Jun 2022 18:03:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656378183; cv=none; d=google.com; s=arc-20160816; b=MewODPhEn5t0klGsTmoNS17DWRCoGm65ZBCgcG7Xh1DlsOg1oCDljxxf0dCA4GkPS0 LGB5S7KJd2y2He1I7RSq7DCoiFyE9tc84JTzD0IYQftbr4l4dFKXX9lVOdkzVc+/4R6v mCZ/qTS1ATWIqjTdphxynfFd1IZIV8sZhJ+LZzVJcAyGwdZaPNGH3HOLXw+CT9fq1EkD 66kiV6m3mNTa0bW+sXrA+Rt8BNCfk6oOY+kenHAK3OZs0EDXqDkWf2nmGYNjDQhCOm6a zh015s8QG1WALdvM3BqMAQpVkIadkXUre3CeMlQICiJXzS8WcWuT4bSWZrPKqVtcZO2c p5/w== 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=eVCvPCGOPZ0Zr0RHKZL6+6W6c/1gohVwGCslygFNT9M=; b=Vxhr1kHM8vLAq3xV1lD6c6sl3OiB/RvmxHgyGbuCqrmdTg4FOE53BkQGj/eA8LEUXp g1zotq8JGGWQLZOSiG5uwxTVWbssg0djhlBUb+ENHnrh9LIaDFarSt7MD5DchtsuhQb6 vFoleiPaECHuMVbt1bzjARhPAcX6rdHTbAFRgLZbKXlHNZsYNTAAAvNS3YjNu0s2nQaF m0/18jQuYje8Zh+z5KdYvQPOj8BtsGacrC8xNE6uqo2sIibxnWqN5mTdOtdi0cbS32F6 OOfzdcw0/PMLp0MgNs8bH659v2ARv3Iy3KqW3Su8BmX5xdhJSf7b/Ah6qwELr9nlZpja ipug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iwou9q2y; spf=pass (google.com: domain of mptcp+bounces-5856-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5856-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id a9-20020a17090a70c900b001ed45e83544si11188364pjm.31.2022.06.27.18.03.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2022 18:03:03 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5856-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iwou9q2y; spf=pass (google.com: domain of mptcp+bounces-5856-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5856-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id A3641280CBC for ; Tue, 28 Jun 2022 01:03:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F3E6371; Tue, 28 Jun 2022 01:02:56 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 C3FDF7A for ; Tue, 28 Jun 2022 01:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656378174; x=1687914174; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EJvn72C9iNx1ZNK7vsLL/vNLnYeIv6S01w9Gf9NZz9M=; b=iwou9q2yYAME3zm1cHyA+i3f8OeHaOeJMd4fnyD8/dFeTO5VUBjVlK/Y L4H3y6wQvRtbfWN3PxfMaKGVvDR8htPLFxM1SeL2TvGphd5OcaI00RHgj Kfh7fempnCCdQX7p1mTPQLsjAf4MBC7lMxYCKROzw/2g5JEcIP3Ctw9cL q8FETus1Oe+2l/XjOAN5KEyT25VL1w3vnHOSZe3WJZtgK3T2PcbzH57xf 5k79HpZP8dJLxjkhPNcpuZXC9GvrB0Ss1oV9EbHnWwioIJ8VqocU1YIjx Gwq/2w6h1ONPphaVMwBd6qjkCKO9xQgwtxRLc0c90GF0pLauWacbMjlSg Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10391"; a="270347726" X-IronPort-AV: E=Sophos;i="5.92,227,1650956400"; d="scan'208";a="270347726" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2022 18:02:52 -0700 X-IronPort-AV: E=Sophos;i="5.92,227,1650956400"; d="scan'208";a="692867420" Received: from cgarner-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.0.217]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2022 18:02:51 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Ossama Othman , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 8/9] mptcp: fix conflict with Date: Mon, 27 Jun 2022 18:02:42 -0700 Message-Id: <20220628010243.166605-9-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220628010243.166605-1-mathew.j.martineau@linux.intel.com> References: <20220628010243.166605-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: Ossama Othman Including before the C library header causes symbol redefinition errors at compile-time due to duplicate declarations and definitions in the header included by . Explicitly include before in when __KERNEL__ is not defined so that the C library compatibility logic in is enabled when including in user space code. Fixes: c11c5906bc0a ("mptcp: add MPTCP_SUBFLOW_ADDRS getsockopt support") Signed-off-by: Ossama Othman Signed-off-by: Mat Martineau --- include/uapi/linux/mptcp.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 921963589904..dfe19bf13f4c 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -2,16 +2,17 @@ #ifndef _UAPI_MPTCP_H #define _UAPI_MPTCP_H =20 +#ifndef __KERNEL__ +#include /* for sockaddr_in and sockaddr_in6 */ +#include /* for struct sockaddr */ +#endif + #include #include #include /* for sockaddr_in */ #include /* for sockaddr_in6 */ #include /* for sockaddr_storage and sa_family */ =20 -#ifndef __KERNEL__ -#include /* for struct sockaddr */ -#endif - #define MPTCP_SUBFLOW_FLAG_MCAP_REM _BITUL(0) #define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1) #define MPTCP_SUBFLOW_FLAG_JOIN_REM _BITUL(2) --=20 2.37.0