From: Jiri Pirko <jiri@resnulli.us>
To: Wojciech Drewek <wojciech.drewek@intel.com>
Cc: simon.horman@corigine.com, maksym.glubokiy@plvision.eu,
komachi.yoshiki@gmail.com, jchapman@katalix.com,
edumazet@google.com, boris.sukholitko@broadcom.com,
louis.peens@corigine.com, gnault@redhat.com,
intel-wired-lan@lists.osuosl.org, vladbu@nvidia.com,
kuba@kernel.org, pabeni@redhat.com, pablo@netfilter.org,
baowen.zheng@corigine.com, kurt@linutronix.de, paulb@nvidia.com,
jhs@mojatatu.com, xiyou.wangcong@gmail.com,
netdev@vger.kernel.org, davem@davemloft.net
Subject: Re: [Intel-wired-lan] [RFC PATCH net-next 1/5] uapi: move IPPROTO_L2TP to in.h
Date: Fri, 26 Aug 2022 13:17:37 +0200 [thread overview]
Message-ID: <Ywir0R7xdE7RZIhD@nanopsycho> (raw)
In-Reply-To: <20220826110059.119927-2-wojciech.drewek@intel.com>
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
>
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
WARNING: multiple messages have this Message-ID (diff)
From: Jiri Pirko <jiri@resnulli.us>
To: Wojciech Drewek <wojciech.drewek@intel.com>
Cc: netdev@vger.kernel.org, alexandr.lobakin@intel.com,
jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com,
marcin.szycik@linux.intel.com,
michal.swiatkowski@linux.intel.com, kurt@linutronix.de,
boris.sukholitko@broadcom.com, vladbu@nvidia.com,
komachi.yoshiki@gmail.com, paulb@nvidia.com,
baowen.zheng@corigine.com, louis.peens@corigine.com,
simon.horman@corigine.com, pablo@netfilter.org,
maksym.glubokiy@plvision.eu, intel-wired-lan@lists.osuosl.org,
jchapman@katalix.com, gnault@redhat.com
Subject: Re: [RFC PATCH net-next 1/5] uapi: move IPPROTO_L2TP to in.h
Date: Fri, 26 Aug 2022 13:17:37 +0200 [thread overview]
Message-ID: <Ywir0R7xdE7RZIhD@nanopsycho> (raw)
In-Reply-To: <20220826110059.119927-2-wojciech.drewek@intel.com>
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
>
next prev parent reply other threads:[~2022-08-26 11:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 11:00 [Intel-wired-lan] [RFC PATCH net-next 0/5] ice: L2TPv3 offload support Wojciech Drewek
2022-08-26 11:00 ` Wojciech Drewek
2022-08-26 11:00 ` [Intel-wired-lan] [RFC PATCH net-next 1/5] uapi: move IPPROTO_L2TP to in.h Wojciech Drewek
2022-08-26 11:00 ` Wojciech Drewek
2022-08-26 11:17 ` Jiri Pirko [this message]
2022-08-26 11:17 ` Jiri Pirko
2022-08-26 11:22 ` [Intel-wired-lan] " Jiri Pirko
2022-08-26 11:22 ` Jiri Pirko
2022-08-26 11:00 ` [Intel-wired-lan] [RFC PATCH net-next 2/5] flow_dissector: Add L2TPv3 dissectors Wojciech Drewek
2022-08-26 11:00 ` Wojciech Drewek
2022-08-26 11:00 ` [Intel-wired-lan] [RFC PATCH net-next 3/5] net/sched: flower: Add L2TPv3 filter Wojciech Drewek
2022-08-26 11:00 ` Wojciech Drewek
2022-08-26 11:00 ` [Intel-wired-lan] [RFC PATCH net-next 4/5] flow_offload: Introduce flow_match_l2tpv3 Wojciech Drewek
2022-08-26 11:00 ` Wojciech Drewek
2022-08-26 11:00 ` [Intel-wired-lan] [RFC PATCH net-next 5/5] ice: Add L2TPv3 hardware offload support Wojciech Drewek
2022-08-26 11:00 ` Wojciech Drewek
2022-08-26 11:16 ` [Intel-wired-lan] [RFC PATCH net-next 0/5] ice: L2TPv3 " Jiri Pirko
2022-08-26 11:16 ` Jiri Pirko
2022-08-26 11:36 ` [Intel-wired-lan] " Drewek, Wojciech
2022-08-26 11:36 ` Drewek, Wojciech
2022-08-26 11:52 ` [Intel-wired-lan] " Drewek, Wojciech
2022-08-26 11:52 ` Drewek, Wojciech
2022-08-26 14:34 ` [Intel-wired-lan] " Jiri Pirko
2022-08-26 14:34 ` Jiri Pirko
2022-08-27 1:01 ` [Intel-wired-lan] " Jakub Kicinski
2022-08-27 1:01 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Ywir0R7xdE7RZIhD@nanopsycho \
--to=jiri@resnulli.us \
--cc=baowen.zheng@corigine.com \
--cc=boris.sukholitko@broadcom.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gnault@redhat.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jchapman@katalix.com \
--cc=jhs@mojatatu.com \
--cc=komachi.yoshiki@gmail.com \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=louis.peens@corigine.com \
--cc=maksym.glubokiy@plvision.eu \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
--cc=paulb@nvidia.com \
--cc=simon.horman@corigine.com \
--cc=vladbu@nvidia.com \
--cc=wojciech.drewek@intel.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.