uapi: move IPPROTO_L2TP to in.h · tjh.dev/kernel@65b32f8

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

uapi: move IPPROTO_L2TP to in.h

IPPROTO_L2TP is currently defined in l2tp.h, but most of
ip protocols are defined in in.h file. Move it there in order
to keep code clean.

Acked-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Wojciech Drewek and committed by

Paolo Abeni 3 years ago 65b32f80 ed48cfed

+2 -2

2 changed files

expand all

include

uapi

linux

in.h

l2tp.h

include/uapi/linux/in.h

··· 68 68 #define IPPROTO_PIM IPPROTO_PIM 69 69 IPPROTO_COMP = 108, /* Compression Header Protocol */ 70 70 #define IPPROTO_COMP IPPROTO_COMP 71 + IPPROTO_L2TP = 115, /* Layer 2 Tunnelling Protocol */ 72 + #define IPPROTO_L2TP IPPROTO_L2TP 71 73 IPPROTO_SCTP = 132, /* Stream Control Transport Protocol */ 72 74 #define IPPROTO_SCTP IPPROTO_SCTP 73 75 IPPROTO_UDPLITE = 136, /* UDP-Lite (RFC 3828) */

-2

include/uapi/linux/l2tp.h

··· 13 13 #include <linux/in.h> 14 14 #include <linux/in6.h> 15 15 16 - #define IPPROTO_L2TP 115 17 - 18 16 /** 19 17 * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets 20 18 * @l2tp_family: address family number AF_L2TPIP.