* [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
@ 2014-08-06 22:10 Pablo Neira Ayuso
2014-08-06 22:13 ` Florian Westphal
2014-08-06 22:15 ` Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2014-08-06 22:10 UTC (permalink / raw)
To: therbert; +Cc: netfilter-devel, davem, davej, netdev
cb1ce2e ("ipv6: Implement automatic flow label generation on transmit")
accidentally uses socket option 64, which is already used by ip6tables:
IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64
IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65
There is comment include/uapi/linux/in6.h warning about that.
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/uapi/linux/in6.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
index 22b7a69..1d929c0 100644
--- a/include/uapi/linux/in6.h
+++ b/include/uapi/linux/in6.h
@@ -233,7 +233,6 @@ struct in6_flowlabel_req {
#if 0 /* not yet */
#define IPV6_USE_MIN_MTU 63
#endif
-#define IPV6_AUTOFLOWLABEL 64
/*
* Netfilter (1)
@@ -250,6 +249,7 @@ struct in6_flowlabel_req {
*/
#define IPV6_RECVTCLASS 66
#define IPV6_TCLASS 67
+#define IPV6_AUTOFLOWLABEL 68
/*
* Netfilter (2)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
2014-08-06 22:10 [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL Pablo Neira Ayuso
@ 2014-08-06 22:13 ` Florian Westphal
2014-08-06 22:17 ` David Miller
2014-08-06 22:15 ` Pablo Neira Ayuso
1 sibling, 1 reply; 4+ messages in thread
From: Florian Westphal @ 2014-08-06 22:13 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: therbert, netfilter-devel, davem, davej, netdev
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> cb1ce2e ("ipv6: Implement automatic flow label generation on transmit")
> accidentally uses socket option 64, which is already used by ip6tables:
>
> IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64
> IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65
>
> There is comment include/uapi/linux/in6.h warning about that.
>
> Cc: Tom Herbert <therbert@google.com>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> include/uapi/linux/in6.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
> index 22b7a69..1d929c0 100644
> --- a/include/uapi/linux/in6.h
> +++ b/include/uapi/linux/in6.h
> @@ -233,7 +233,6 @@ struct in6_flowlabel_req {
> #if 0 /* not yet */
> #define IPV6_USE_MIN_MTU 63
> #endif
> -#define IPV6_AUTOFLOWLABEL 64
>
> /*
> * Netfilter (1)
> @@ -250,6 +249,7 @@ struct in6_flowlabel_req {
> */
> #define IPV6_RECVTCLASS 66
> #define IPV6_TCLASS 67
> +#define IPV6_AUTOFLOWLABEL 68
This clashes with IP6T_SO_GET_REVISION_MATCH 8-}
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
2014-08-06 22:13 ` Florian Westphal
@ 2014-08-06 22:17 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-08-06 22:17 UTC (permalink / raw)
To: fw; +Cc: pablo, therbert, netfilter-devel, davej, netdev
From: Florian Westphal <fw@strlen.de>
Date: Thu, 7 Aug 2014 00:13:13 +0200
> Pablo Neira Ayuso <pablo@netfilter.org> wrote:
>> cb1ce2e ("ipv6: Implement automatic flow label generation on transmit")
>> accidentally uses socket option 64, which is already used by ip6tables:
>>
>> IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64
>> IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65
>>
>> There is comment include/uapi/linux/in6.h warning about that.
>>
>> Cc: Tom Herbert <therbert@google.com>
>> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
...
>> @@ -250,6 +249,7 @@ struct in6_flowlabel_req {
>> */
>> #define IPV6_RECVTCLASS 66
>> #define IPV6_TCLASS 67
>> +#define IPV6_AUTOFLOWLABEL 68
>
> This clashes with IP6T_SO_GET_REVISION_MATCH 8-}
:-) 77 appears to be the next actually usable value.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
2014-08-06 22:10 [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL Pablo Neira Ayuso
2014-08-06 22:13 ` Florian Westphal
@ 2014-08-06 22:15 ` Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2014-08-06 22:15 UTC (permalink / raw)
To: therbert; +Cc: netfilter-devel, davem, davej, netdev
On Thu, Aug 07, 2014 at 12:10:50AM +0200, Pablo Neira Ayuso wrote:
> cb1ce2e ("ipv6: Implement automatic flow label generation on transmit")
> accidentally uses socket option 64, which is already used by ip6tables:
>
> IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64
> IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65
>
> There is comment include/uapi/linux/in6.h warning about that.
Wrong patch, 68 is also used.
Sending a v2.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-08-06 22:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-06 22:10 [PATCH] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL Pablo Neira Ayuso
2014-08-06 22:13 ` Florian Westphal
2014-08-06 22:17 ` David Miller
2014-08-06 22:15 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).