diff --git a/[refs] b/[refs] index 5021bb712a76..b9141cd94861 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebd61cc042b16e6cf2486aafbfff9e4be8c213ee +refs/heads/master: 3fd8f9e4b6c184d03d340bc86630f700de967fa8 diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index 3ac39f1ec775..3599770a2473 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -436,6 +436,7 @@ config NETFILTER_XT_MATCH_CONNBYTES config NETFILTER_XT_MATCH_CONNLIMIT tristate '"connlimit" match support"' depends on NETFILTER_XTABLES + depends on NF_CONNTRACK ---help--- This match allows you to match against the number of parallel connections to a server per client IP address (or address block).