summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorPablo Neira <pablo@netfilter.org>2014-08-07 00:17:09 +0200
committerDavid S. Miller <davem@davemloft.net>2014-08-06 15:25:01 -0700
commit753a2ad54ef45e3417a9d49537c2b42b04a2e1be (patch)
tree8ec84cf03cfa1ce1d0fd82570b00570c63f5b96c /include/uapi
parent8b429468a6b4746e88abbf5649c9e592d7b3e355 (diff)
downloadlinux-753a2ad54ef45e3417a9d49537c2b42b04a2e1be.tar.gz
linux-753a2ad54ef45e3417a9d49537c2b42b04a2e1be.tar.bz2
linux-753a2ad54ef45e3417a9d49537c2b42b04a2e1be.zip
net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
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. Allocate 70 for this, which seems to be unused instead. Cc: Tom Herbert <therbert@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/in6.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
index 22b7a69619d8..74a2a1773494 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)
@@ -262,6 +261,7 @@ struct in6_flowlabel_req {
* IP6T_SO_ORIGINAL_DST 80
*/
+#define IPV6_AUTOFLOWLABEL 70
/* RFC5014: Source address selection */
#define IPV6_ADDR_PREFERENCES 72