[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt

Browse source

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>

...

This commit is contained in:

Yasuyuki Kozakai 2006-11-14 19:48:48 -08:00 • committed by David S. Miller

parent d8a585d78e

commit b96e7ecbd0

5 changed files with 54 additions and 53 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

include/linux/in6.h

View file

16

include/linux/netfilter/x_tables.h

View file

21

include/linux/netfilter_arp/arp_tables.h

View file

23

include/linux/netfilter_ipv4/ip_tables.h

View file

23

include/linux/netfilter_ipv6/ip6_tables.h

View file