Re: [RFC PATCH net-next 1/5] uapi: move IPPROTO_L2TP to in.h

[Jiri Pirko <jiri@resnulli.us>]

Fri, Aug 26, 2022 at 01:00:55PM CEST, wojciech.drewek@intel.com wrote:
>IPPROTO_L2TP is currently defined in l2tp.h, but most of
>ip protocols is defined in in.h file. Move it there in order
>to keep code clean.
>
>Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com>
>---
> include/uapi/linux/in.h   | 2 ++
> 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 14168225cecd..5a9454c886b3 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

You most certainly cannot do this, as you would break the user including
linux/l2tp.h and using this.


>-
> /**
>  * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets
>  * @l2tp_family:  address family number AF_L2TPIP.
>-- 
>2.31.1
>