Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a725eb15 authored by Dmitry V. Levin's avatar Dmitry V. Levin Committed by David S. Miller
Browse files

uapi: fix linux/if_pppol2tp.h userspace compilation errors 



Because of <linux/libc-compat.h> interface limitations, <netinet/in.h>
provided by libc cannot be included after <linux/in.h>, therefore any
header that includes <netinet/in.h> cannot be included after <linux/in.h>.

Change uapi/linux/l2tp.h, the last uapi header that includes
<netinet/in.h>, to include <linux/in.h> and <linux/in6.h> instead of
<netinet/in.h> and use __SOCK_SIZE__ instead of sizeof(struct sockaddr)
the same way as uapi/linux/in.h does, to fix linux/if_pppol2tp.h userspace
compilation errors like this:

In file included from /usr/include/linux/l2tp.h:12:0,
                 from /usr/include/linux/if_pppol2tp.h:21,
/usr/include/netinet/in.h:31:8: error: redefinition of 'struct in_addr'

Fixes: 47c3e778 ("net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_*")
Signed-off-by: default avatarDmitry V. Levin <ldv@altlinux.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d199fab6

include/uapi/linux/l2tp.h

+3 −4
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ 


#include <linux/types.h>

#include <linux/socket.h>

#ifndef __KERNEL__

#include <netinet/in.h>

#endif

#include <linux/in.h>

#include <linux/in6.h>



#define IPPROTO_L2TP		115
@@ -31,7 +30,7 @@ struct sockaddr_l2tpip { 
	__u32		l2tp_conn_id;	/* Connection ID of tunnel */



	/* Pad to size of `struct sockaddr'. */

	unsigned char	__pad[sizeof(struct sockaddr) -

	unsigned char	__pad[__SOCK_SIZE__ -

			      sizeof(__kernel_sa_family_t) -

			      sizeof(__be16) - sizeof(struct in_addr) -

			      sizeof(__u32)];