Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[karo-tx-linux.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index a8e5544da93e62a7991ce75c51329543da5fd4bb..332acb37b3855e698c239adfc8d42f48ae203528 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -11,7 +11,7 @@ config NETFILTER_NETLINK_QUEUE
        tristate "Netfilter NFQUEUE over NFNETLINK interface"
        depends on NETFILTER_NETLINK
        help
        tristate "Netfilter NFQUEUE over NFNETLINK interface"
        depends on NETFILTER_NETLINK
        help

-         If this option isenabled, the kernel will include support
+         If this option is enabled, the kernel will include support

          for queueing packets via NFNETLINK.
          
 config NETFILTER_NETLINK_LOG
          for queueing packets via NFNETLINK.
          
 config NETFILTER_NETLINK_LOG


@@ -66,7 +66,7 @@ config NF_CONNTRACK_EVENTS
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code
        help
          If this option is enabled, the connection tracking code will
          provide a notifier chain that can be used by other kernel code

-         to get notified aboutchanges in the connection tracking state.
+         to get notified about changes in the connection tracking state.

 
          If unsure, say `N'.
 
 
          If unsure, say `N'.
 


@@ -153,7 +153,7 @@ config NETFILTER_XT_TARGET_NFQUEUE
        tristate '"NFQUEUE" target Support'
        depends on NETFILTER_XTABLES
        help
        tristate '"NFQUEUE" target Support'
        depends on NETFILTER_XTABLES
        help

-         This Target replaced the old obsolete QUEUE target.
+         This target replaced the old obsolete QUEUE target.

 
          As opposed to QUEUE, it supports 65535 different queues,
          not just one.
 
          As opposed to QUEUE, it supports 65535 different queues,
          not just one.


@@ -279,6 +279,16 @@ config NETFILTER_XT_MATCH_MARK
 
          To compile it as a module, choose M here.  If unsure, say N.
 
 
          To compile it as a module, choose M here.  If unsure, say N.
 

+config NETFILTER_XT_MATCH_POLICY
+       tristate 'IPsec "policy" match support'
+       depends on NETFILTER_XTABLES && XFRM
+       help
+         Policy matching allows you to match packets based on the
+         IPsec policy that was used during decapsulation/will
+         be used during encapsulation.
+
+         To compile it as a module, choose M here.  If unsure, say N.
+

 config NETFILTER_XT_MATCH_PHYSDEV
        tristate '"physdev" match support'
        depends on NETFILTER_XTABLES && BRIDGE_NETFILTER
 config NETFILTER_XT_MATCH_PHYSDEV
        tristate '"physdev" match support'
        depends on NETFILTER_XTABLES && BRIDGE_NETFILTER