[NETFILTER]: Use lowercase names for matches in Kconfig

[safe/jmp/linux-2.6] / net / ipv6 / netfilter / Kconfig

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 98f7875..5374c66 100644 (file)
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -6,8 +6,8 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
        depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
 
 config NF_CONNTRACK_IPV6
-       tristate "IPv6 support for new connection tracking (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && NF_CONNTRACK
+       tristate "IPv6 connection tracking support (EXPERIMENTAL)"
+       depends on INET && IPV6 && EXPERIMENTAL && NF_CONNTRACK
        ---help---
          Connection tracking keeps a record of what packets have passed
          through your machine, in order to figure out how they are related
@@ -21,13 +21,14 @@ config NF_CONNTRACK_IPV6
 
 config IP6_NF_QUEUE
        tristate "IP6 Userspace queueing via NETLINK (OBSOLETE)"
+       depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
        ---help---
 
          This option adds a queue handler to the kernel for IPv6
          packets which enables users to receive the filtered packets
          with QUEUE target using libipq.
 
-         THis option enables the old IPv6-only "ip6_queue" implementation
+         This option enables the old IPv6-only "ip6_queue" implementation
          which has been obsoleted by the new "nfnetlink_queue" code (see
          CONFIG_NETFILTER_NETLINK_QUEUE).
 
@@ -40,8 +41,9 @@ config IP6_NF_QUEUE
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP6_NF_IPTABLES
-       tristate "IP6 tables support (required for filtering/masq/NAT)"
-       depends on NETFILTER_XTABLES
+       tristate "IP6 tables support (required for filtering)"
+       depends on INET && IPV6 && EXPERIMENTAL
+       select NETFILTER_XTABLES
        help
          ip6tables is a general, extensible packet identification framework.
          Currently only the packet filtering and packet mangling subsystem
@@ -52,7 +54,7 @@ config IP6_NF_IPTABLES
 
 # The simple matches.
 config IP6_NF_MATCH_RT
-       tristate "Routing header match support"
+       tristate '"rt" Routing header match support'
        depends on IP6_NF_IPTABLES
        help
          rt matching allows you to match packets based on the routing
@@ -61,7 +63,7 @@ config IP6_NF_MATCH_RT
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP6_NF_MATCH_OPTS
-       tristate "Hop-by-hop and Dst opts header match support"
+       tristate '"hopbyhop" and "dst" opts header match support'
        depends on IP6_NF_IPTABLES
        help
          This allows one to match packets based on the hop-by-hop
@@ -70,7 +72,7 @@ config IP6_NF_MATCH_OPTS
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP6_NF_MATCH_FRAG
-       tristate "Fragmentation header match support"
+       tristate '"frag" Fragmentation header match support'
        depends on IP6_NF_IPTABLES
        help
          frag matching allows you to match packets based on the fragmentation
@@ -79,7 +81,7 @@ config IP6_NF_MATCH_FRAG
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP6_NF_MATCH_HL
-       tristate "HL match support"
+       tristate '"hl" match support'
        depends on IP6_NF_IPTABLES
        help
          HL matching allows you to match packets based on the hop
@@ -87,44 +89,33 @@ config IP6_NF_MATCH_HL
 
          To compile it as a module, choose M here.  If unsure, say N.
 
-config IP6_NF_MATCH_MULTIPORT
-       tristate "Multiple port match support"
-       depends on IP6_NF_IPTABLES
-       help
-         Multiport matching allows you to match TCP or UDP packets based on
-         a series of source or destination ports: normally a rule can only
-         match a single range of ports.
-
-         To compile it as a module, choose M here.  If unsure, say N.
-
-config IP6_NF_MATCH_OWNER
-       tristate "Owner match support"
+config IP6_NF_MATCH_IPV6HEADER
+       tristate '"ipv6header" IPv6 Extension Headers Match'
        depends on IP6_NF_IPTABLES
        help
-         Packet owner matching allows you to match locally-generated packets
-         based on who created them: the user, group, process or session.
+         This module allows one to match packets based upon
+         the ipv6 extension headers.
 
          To compile it as a module, choose M here.  If unsure, say N.
 
-config IP6_NF_MATCH_IPV6HEADER
-       tristate "IPv6 Extension Headers Match"
+config IP6_NF_MATCH_AH
+       tristate '"ah" match support'
        depends on IP6_NF_IPTABLES
        help
-         This module allows one to match packets based upon
-         the ipv6 extension headers.
+         This module allows one to match AH packets.
 
          To compile it as a module, choose M here.  If unsure, say N.
 
-config IP6_NF_MATCH_AHESP
-       tristate "AH/ESP match support"
+config IP6_NF_MATCH_MH
+       tristate '"mh" match support'
        depends on IP6_NF_IPTABLES
        help
-         This module allows one to match AH and ESP packets.
+         This module allows one to match MH packets.
 
          To compile it as a module, choose M here.  If unsure, say N.
 
 config IP6_NF_MATCH_EUI64
-       tristate "EUI64 address check"
+       tristate '"eui64" address check'
        depends on IP6_NF_IPTABLES
        help
          This module performs checking on the IPv6 source address
@@ -198,7 +189,7 @@ config IP6_NF_RAW
          and OUTPUT chains.
        
          If you want to compile it as a module, say M here and read
-         <file:Documentation/modules.txt>.  If unsure, say `N'.
+         <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 
 endmenu