summaryrefslogtreecommitdiff
path: root/net/netfilter/ipset/Kconfig
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
commit62b8c978ee6b8d135d9e7953221de58000dba986 (patch)
tree683b04b2e627f6710c22c151b23c8cc9a165315e /net/netfilter/ipset/Kconfig
parent78fd82238d0e5716578c326404184a27ba67fd6e (diff)
downloadlinux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'net/netfilter/ipset/Kconfig')
-rw-r--r--net/netfilter/ipset/Kconfig20
1 files changed, 1 insertions, 19 deletions
diff --git a/net/netfilter/ipset/Kconfig b/net/netfilter/ipset/Kconfig
index a2d6263..ba36c28 100644
--- a/net/netfilter/ipset/Kconfig
+++ b/net/netfilter/ipset/Kconfig
@@ -1,7 +1,7 @@
menuconfig IP_SET
tristate "IP set support"
depends on INET && NETFILTER
- select NETFILTER_NETLINK
+ depends on NETFILTER_NETLINK
help
This option adds IP set support to the kernel.
In order to define and use the sets, you need the userspace utility
@@ -90,15 +90,6 @@ config IP_SET_HASH_IPPORTNET
To compile it as a module, choose M here. If unsure, say N.
-config IP_SET_HASH_NETPORTNET
- tristate "hash:net,port,net set support"
- depends on IP_SET
- help
- This option adds the hash:net,port,net set type support, by which
- one can store two IPv4/IPv6 subnets, and a protocol/port in a set.
-
- To compile it as a module, choose M here. If unsure, say N.
-
config IP_SET_HASH_NET
tristate "hash:net set support"
depends on IP_SET
@@ -108,15 +99,6 @@ config IP_SET_HASH_NET
To compile it as a module, choose M here. If unsure, say N.
-config IP_SET_HASH_NETNET
- tristate "hash:net,net set support"
- depends on IP_SET
- help
- This option adds the hash:net,net set type support, by which
- one can store IPv4/IPv6 network address/prefix pairs in a set.
-
- To compile it as a module, choose M here. If unsure, say N.
-
config IP_SET_HASH_NETPORT
tristate "hash:net,port set support"
depends on IP_SET