]> git.baikalelectronics.ru Git - kernel.git/commit
net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
authorPablo Neira <pablo@netfilter.org>
Wed, 6 Aug 2014 22:17:09 +0000 (00:17 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 22:25:01 +0000 (15:25 -0700)
commit8471a7c83ba38bce5c55a8a8f8c300048636bbb6
tree8ec84cf03cfa1ce1d0fd82570b00570c63f5b96c
parent8c63dc4eae78d00dd6e336360ae66a8145ffeb40
net: reallocate new socket option number for IPV6_AUTOFLOWLABEL

4c167a7 ("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>
include/uapi/linux/in6.h