diff options
| author | Wojciech Drewek <[email protected]> | 2022-09-08 10:16:40 -0700 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2022-09-20 09:13:38 +0200 |
| commit | 65b32f801bfbc54dc98144a6ec26082b59d131ee (patch) | |
| tree | cef3d2de1e9e52670634405f477d11356ccd58b4 | |
| parent | ed48cfedf1e2250c856d0f894310d081adde5040 (diff) | |
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 <[email protected]>
Signed-off-by: Wojciech Drewek <[email protected]>
Signed-off-by: Tony Nguyen <[email protected]>
Signed-off-by: Paolo Abeni <[email protected]>
| -rw-r--r-- | include/uapi/linux/in.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/l2tp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h index 578daa6f816b..f243ce665f74 100644 --- a/include/uapi/linux/in.h +++ b/include/uapi/linux/in.h @@ -68,6 +68,8 @@ enum { #define IPPROTO_PIM IPPROTO_PIM IPPROTO_COMP = 108, /* Compression Header Protocol */ #define IPPROTO_COMP IPPROTO_COMP + IPPROTO_L2TP = 115, /* Layer 2 Tunnelling Protocol */ +#define IPPROTO_L2TP IPPROTO_L2TP IPPROTO_SCTP = 132, /* Stream Control Transport Protocol */ #define IPPROTO_SCTP IPPROTO_SCTP IPPROTO_UDPLITE = 136, /* UDP-Lite (RFC 3828) */ diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h index bab8c9708611..7d81c3e1ec29 100644 --- a/include/uapi/linux/l2tp.h +++ b/include/uapi/linux/l2tp.h @@ -13,8 +13,6 @@ #include <linux/in.h> #include <linux/in6.h> -#define IPPROTO_L2TP 115 - /** * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets * @l2tp_family: address family number AF_L2TPIP. |