From nobody Thu Sep 18 06:45:13 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp213121pih; Thu, 19 May 2022 08:40:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXAPagnbBwqPZCvT52sHR+t1U0FzZNZbXpVlsahpCejCma9MHDoipjDkfw0T/0Q9v2uwib X-Received: by 2002:a17:90b:4ac1:b0:1df:c71d:510c with SMTP id mh1-20020a17090b4ac100b001dfc71d510cmr6282901pjb.118.1652974833746; Thu, 19 May 2022 08:40:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652974833; cv=none; d=google.com; s=arc-20160816; b=kyMcea6ep/uAQS3W+twS6B7kDLb5GxfSsctAT1zEGM20glmz5DW9O7yriL9FbpIDPZ r5Gw60NS66ecu80UcOMqRD2cH61+nnrIXVNoR+sI3nYVN8OdZo/rk+zFW2UumEk98w5W bnIE7+qaPVcQ6OJd89YKkelaGIing05HyV4sc+0kbAyeS27xTm1H5MWjty4BZTWRuRim RKBJALZ2r7BgAjOViJPABr4w0tM+JDUoMdRWyv6Rmhn46ZpYPQb6NUjiDsUUw1CDchk0 YYr/appfqVpoOpMjminaFtR8QZ+iJEw+vpgnX2IbCLM5i3Gad3sg2EF6ZSgYR/DVJmMn FJWQ== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=pKLKo70g6togMlHkHAmjaaA5K8/SPp6HD60y+EHKvNo=; b=cxbJmnWIm8hrYZZEivQZGgaNA626pz9qf7m6W3D543tJTXsxEx+MQahocb9f9BB8JS uwCzZE06SixVzmBRUukFYP5hw+YgrGNWt8MNhrKh6legY6RTNv6KhqMQM8veqT9EUWYq MNb//sYw++SXq2/e3entgZJACwJ/DuEoG/rZ9m1L/j3diDqc8Au00STckD47uyEWX1Nx gJCRLRN+crr8sLwfYRCC7E1tBSqETzam+FHRzW6NG14LI/59iIjbYOrTwrL31mT1Tc1o X733AmlVWxJrvZ0CbCx810zE047mixNwqrDrkasV7GeD0C3x6SwX2tRwQNKnwPjHOnmC gEAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EKiH9Z2m; spf=pass (google.com: domain of mptcp+bounces-5396-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5396-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id z14-20020aa7888e000000b004fabd831538si7442195pfe.196.2022.05.19.08.40.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2022 08:40:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5396-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=@gmail.com header.s=20210112 header.b=EKiH9Z2m; spf=pass (google.com: domain of mptcp+bounces-5396-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5396-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 311B9280940 for ; Thu, 19 May 2022 15:40:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2741028FC; Thu, 19 May 2022 15:40:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09B3F28EE for ; Thu, 19 May 2022 15:40:30 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id v10so5393540pgl.11 for ; Thu, 19 May 2022 08:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pKLKo70g6togMlHkHAmjaaA5K8/SPp6HD60y+EHKvNo=; b=EKiH9Z2mcioa6mklctNjLc089L3WMMovMh+ARzDQQxF5Q5oJTAUhvI/qvq6EW6DHAi ggdq8OSkyXEz41KTHGRit/1Bjsfqria3WAwDoSWcsZ5hUVORMO8l9MP2eZdAk+MBGrmz Y7Dhx7gAPqiQpgEHXn1J6NLCs8ww0WsdEUTFLPyV3g2fB/lDzTBpnaOASezCr2yFr98t /XNm+b592F09u+Xdj0GKTXT4FF3UAd1S+egvCe06/ieUbl+sVv4/zMiVjY7alvU2belg JelsbXXCcdlrYajoiwF+wf4q9MxVAMAEm0xyxEt4YL2OF3W0oC5S8ra9KChqCANeHjA5 pHIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pKLKo70g6togMlHkHAmjaaA5K8/SPp6HD60y+EHKvNo=; b=sdmuQ2n9IEdK/rTLPWolbis8NLl/C0q6/Jq8D1ExHRJs4FCc4yH0olpAmSDbQWJveb 0DlfFRlssvHl7Lt12fMmnyYOpi+3AhvYL5ZORRwEfYCfUdPAlFp7foI0vdoHxCf61W53 m40mD4p6Jyz4ZIYL3zQKerjdHLW0jA4TjesTEraVMVMCoP3C2p6QjBOgOk4dkr1HZ+dr M6KZ2ici+k/zDlwd1jgiJ0xQ+sZvh9mVR1GZqk6Ex5+0CvhVPc++49h5vUZOULSbxEuE XEGlvqESz5D+GzB5L72/xoqIEAyxGhgSka+TUD8JOghMo85114ki+WkwoErVqpRsbHTT dJ9w== X-Gm-Message-State: AOAM532MtZqWamECPcZTd+6ZxIjSxEbCfyuIRnWCdX2pwp1dBaYCRmEA 4/s+etsiRKI8pXNsvbyZRTO4LVRU6Bpr/Q== X-Received: by 2002:a05:6a00:170a:b0:50d:3e40:9e0 with SMTP id h10-20020a056a00170a00b0050d3e4009e0mr5263151pfc.48.1652974829908; Thu, 19 May 2022 08:40:29 -0700 (PDT) Received: from hydra.localdomain ([50.45.159.39]) by smtp.gmail.com with ESMTPSA id c22-20020a170902c2d600b0015e8d4eb2cdsm3976008pla.279.2022.05.19.08.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 08:40:29 -0700 (PDT) From: Ossama Othman X-Google-Original-From: Ossama Othman To: mptcp@lists.linux.dev Cc: Ossama Othman Subject: [PATCH mptcp-next] mptcp: fix conflict with Date: Thu, 19 May 2022 08:39:29 -0700 Message-Id: <20220519153929.214331-1-ossama.othman@intel.com> X-Mailer: git-send-email 2.34.1 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" 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. Signed-off-by: Ossama Othman Reviewed-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.34.1