aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-10 14:50:02 -0500
committerDavid S. Miller <davem@davemloft.net>2014-01-10 14:50:02 -0500
commitef8570d859a5872db525ec1464165352e4f2bdaa (patch)
tree272758d4f1324294ed0eb66b416aeb5faca2d342 /net/netfilter/Kconfig
parent11b57f90257c1d6a91cee720151b69e0c2020cf6 (diff)
parent74f77a6b2b1c98d3f14364dccdd2353b99ecfeda (diff)
downloadlinux-ef8570d859a5872db525ec1464165352e4f2bdaa.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says: ==================== This batch contains one single patch with the l2tp match for xtables, from James Chapman. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/Kconfig')
-rw-r--r--net/netfilter/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 37d2092705a7eb..afe50c0f526f33 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -1139,6 +1139,16 @@ config NETFILTER_XT_MATCH_IPVS
If unsure, say N.
+config NETFILTER_XT_MATCH_L2TP
+ tristate '"l2tp" match support'
+ depends on NETFILTER_ADVANCED
+ default L2TP
+ ---help---
+ This option adds an "L2TP" match, which allows you to match against
+ L2TP protocol header fields.
+
+ To compile it as a module, choose M here. If unsure, say N.
+
config NETFILTER_XT_MATCH_LENGTH
tristate '"length" match support'
depends on NETFILTER_ADVANCED