From: Linus Torvalds Date: Wed, 30 Jan 2008 13:26:10 +0000 (+1100) Subject: Make !NETFILTER_ADVANCED enable IP6_NF_MATCH_IPV6HEADER X-Git-Tag: v2.6.25-rc1~1145 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=44c45eb911845ec58fc3e26cc8994ba868ea2572;p=linux-2.6-omap-h63xx.git Make !NETFILTER_ADVANCED enable IP6_NF_MATCH_IPV6HEADER We want IPV6HEADER matching for the non-advanced default netfilter configuration, since it's part of the standard netfilter setup of at least some distributions (eg Fedora). Otherwise NETFILTER_ADVANCED loses much of its point, since even non-advanced users would have to enable all the advanced options just to get a working IPv6 netfilter setup. Signed-off-by: Linus Torvalds --- diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 4fc0b023cfd..6cae5475737 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -99,7 +99,7 @@ config IP6_NF_MATCH_HL config IP6_NF_MATCH_IPV6HEADER tristate '"ipv6header" IPv6 Extension Headers Match' depends on IP6_NF_IPTABLES - depends on NETFILTER_ADVANCED + default m if NETFILTER_ADVANCED=n help This module allows one to match packets based upon the ipv6 extension headers.