lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <Ywis3PYhKiATnzXB@nanopsycho> Date: Fri, 26 Aug 2022 13:22:04 +0200 From: Jiri Pirko <jiri@...nulli.us> To: Wojciech Drewek <wojciech.drewek@...el.com> Cc: netdev@...r.kernel.org, alexandr.lobakin@...el.com, jesse.brandeburg@...el.com, anthony.l.nguyen@...el.com, davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com, jhs@...atatu.com, xiyou.wangcong@...il.com, marcin.szycik@...ux.intel.com, michal.swiatkowski@...ux.intel.com, kurt@...utronix.de, boris.sukholitko@...adcom.com, vladbu@...dia.com, komachi.yoshiki@...il.com, paulb@...dia.com, baowen.zheng@...igine.com, louis.peens@...igine.com, simon.horman@...igine.com, pablo@...filter.org, maksym.glubokiy@...ision.eu, intel-wired-lan@...ts.osuosl.org, jchapman@...alix.com, gnault@...hat.com Subject: Re: [RFC PATCH net-next 1/5] uapi: move IPPROTO_L2TP to in.h Fri, Aug 26, 2022 at 01:17:37PM CEST, jiri@...nulli.us wrote: >Fri, Aug 26, 2022 at 01:00:55PM CEST, wojciech.drewek@...el.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@...el.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. Ah wait, you include in.h, I overlooked. > > >>- >> /** >> * struct sockaddr_l2tpip - the sockaddr structure for L2TP-over-IP sockets >> * @l2tp_family: address family number AF_L2TPIP. >>-- >>2.31.1 >>
Powered by blists - more mailing lists