]> err.no Git - linux-2.6/commit
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Wed, 15 Nov 2006 03:48:48 +0000 (19:48 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 16 Nov 2006 05:18:49 +0000 (21:18 -0800)
commitb96e7ecbd052a0916b6078e7600604d7e276a336
tree5b2eb36452ea27124f997d309cc514475148f81f
parentd8a585d78efdf191a64ca655136ac1e49fd27cf4
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt

66 and 67 for getsockopt on IPv6 socket is doubly used for IPv6 Advanced
API and ip6tables. This moves numbers for ip6tables to 68 and 69.
This also kills XT_SO_* because {ip,ip6,arp}_tables doesn't have so much
common numbers now.

The old userland tools keep to behave as ever, because old kernel always
calls functions of IPv6 Advanced API for their numbers.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/in6.h
include/linux/netfilter/x_tables.h
include/linux/netfilter_arp/arp_tables.h
include/linux/netfilter_ipv4/ip_tables.h
include/linux/netfilter_ipv6/ip6_tables.h