From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Ossama Othman <ossama.othman@intel.com>,
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 <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net 8/9] mptcp: fix conflict with <netinet/in.h>
Date: Mon, 27 Jun 2022 18:02:42 -0700 [thread overview]
Message-ID: <20220628010243.166605-9-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20220628010243.166605-1-mathew.j.martineau@linux.intel.com>
From: Ossama Othman <ossama.othman@intel.com>
Including <linux/mptcp.h> before the C library <netinet/in.h> header
causes symbol redefinition errors at compile-time due to duplicate
declarations and definitions in the <linux/in.h> header included by
<linux/mptcp.h>.
Explicitly include <netinet/in.h> before <linux/in.h> in
<linux/mptcp.h> when __KERNEL__ is not defined so that the C library
compatibility logic in <linux/libc-compat.h> is enabled when including
<linux/mptcp.h> in user space code.
Fixes: c11c5906bc0a ("mptcp: add MPTCP_SUBFLOW_ADDRS getsockopt support")
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
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
+#ifndef __KERNEL__
+#include <netinet/in.h> /* for sockaddr_in and sockaddr_in6 */
+#include <sys/socket.h> /* for struct sockaddr */
+#endif
+
#include <linux/const.h>
#include <linux/types.h>
#include <linux/in.h> /* for sockaddr_in */
#include <linux/in6.h> /* for sockaddr_in6 */
#include <linux/socket.h> /* for sockaddr_storage and sa_family */
-#ifndef __KERNEL__
-#include <sys/socket.h> /* 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)
--
2.37.0
next prev parent reply other threads:[~2022-06-28 1:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-28 1:02 [PATCH net 0/9] mptcp: Fixes for 5.19 Mat Martineau
2022-06-28 1:02 ` [PATCH net 1/9] mptcp: fix error mibs accounting Mat Martineau
2022-06-28 1:02 ` [PATCH net 2/9] mptcp: introduce MAPPING_BAD_CSUM Mat Martineau
2022-06-28 1:02 ` [PATCH net 3/9] mptcp: invoke MP_FAIL response when needed Mat Martineau
2022-06-28 1:02 ` [PATCH net 4/9] mptcp: fix shutdown vs fallback race Mat Martineau
2022-06-28 1:02 ` [PATCH net 5/9] mptcp: consistent map handling on failure Mat Martineau
2022-06-28 1:02 ` [PATCH net 6/9] mptcp: fix race on unaccepted mptcp sockets Mat Martineau
2022-06-28 1:02 ` [PATCH net 7/9] selftests: mptcp: more stable diag tests Mat Martineau
2022-06-28 1:02 ` Mat Martineau [this message]
2022-06-28 1:02 ` [PATCH net 9/9] selftests: mptcp: Initialize variables to quiet gcc 12 warnings Mat Martineau
2022-06-29 4:00 ` [PATCH net 0/9] mptcp: Fixes for 5.19 patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220628010243.166605-9-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=geliang.tang@suse.com \
--cc=kuba@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=ossama.othman@intel.com \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).