mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-16 07:35:14 +00:00
mptcp: fix conflict with <netinet/in.h>
commit06e445f740
upstream. 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:c11c5906bc
("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> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
fa5121c73f
commit
80620e74e1
1 changed files with 5 additions and 4 deletions
|
@ -2,16 +2,17 @@
|
||||||
#ifndef _UAPI_MPTCP_H
|
#ifndef _UAPI_MPTCP_H
|
||||||
#define _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/const.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/in.h> /* for sockaddr_in */
|
#include <linux/in.h> /* for sockaddr_in */
|
||||||
#include <linux/in6.h> /* for sockaddr_in6 */
|
#include <linux/in6.h> /* for sockaddr_in6 */
|
||||||
#include <linux/socket.h> /* for sockaddr_storage and sa_family */
|
#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_REM _BITUL(0)
|
||||||
#define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1)
|
#define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1)
|
||||||
#define MPTCP_SUBFLOW_FLAG_JOIN_REM _BITUL(2)
|
#define MPTCP_SUBFLOW_FLAG_JOIN_REM _BITUL(2)
|
||||||
|
|
Loading…
Reference in a new issue