Add a hidden tristate option which is selected by all the IP_SET_HASH_*
options. It will be used to wrap ip_set_hash.h.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
net/netfilter/ipset/Kconfig | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/net/netfilter/ipset/Kconfig b/net/netfilter/ipset/Kconfig
index 8a5498a86df0..56b95e859043 100644
--- a/net/netfilter/ipset/Kconfig
+++ b/net/netfilter/ipset/Kconfig
@@ -58,9 +58,13 @@ config IP_SET_BITMAP_PORT
To compile it as a module, choose M here. If unsure, say N.
+config IP_SET_HASH
+ tristate
+
config IP_SET_HASH_IP
tristate "hash:ip set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:ip set type support, by which one
can store arbitrary IPv4 or IPv6 addresses (or network addresses)
@@ -71,6 +75,7 @@ config IP_SET_HASH_IP
config IP_SET_HASH_IPMARK
tristate "hash:ip,mark set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:ip,mark set type support, by which one
can store IPv4/IPv6 address and mark pairs.
@@ -80,6 +85,7 @@ config IP_SET_HASH_IPMARK
config IP_SET_HASH_IPPORT
tristate "hash:ip,port set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:ip,port set type support, by which one
can store IPv4/IPv6 address and protocol/port pairs.
@@ -89,6 +95,7 @@ config IP_SET_HASH_IPPORT
config IP_SET_HASH_IPPORTIP
tristate "hash:ip,port,ip set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:ip,port,ip set type support, by which
one can store IPv4/IPv6 address, protocol/port, and IPv4/IPv6
@@ -99,6 +106,7 @@ config IP_SET_HASH_IPPORTIP
config IP_SET_HASH_IPPORTNET
tristate "hash:ip,port,net set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:ip,port,net set type support, by which
one can store IPv4/IPv6 address, protocol/port, and IPv4/IPv6
@@ -109,6 +117,7 @@ config IP_SET_HASH_IPPORTNET
config IP_SET_HASH_IPMAC
tristate "hash:ip,mac set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:ip,mac set type support, by which
one can store IPv4/IPv6 address and MAC (ethernet address) pairs in a
set.
@@ -118,6 +127,7 @@ config IP_SET_HASH_IPMAC
config IP_SET_HASH_MAC
tristate "hash:mac set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:mac set type support, by which
one can store MAC (ethernet address) elements in a set.
@@ -127,6 +137,7 @@ config IP_SET_HASH_MAC
config IP_SET_HASH_NETPORTNET
tristate "hash:net,port,net set support"
depends on IP_SET
+ select IP_SET_HASH
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.
@@ -136,6 +147,7 @@ config IP_SET_HASH_NETPORTNET
config IP_SET_HASH_NET
tristate "hash:net set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:net set type support, by which
one can store IPv4/IPv6 network address/prefix elements in a set.
@@ -145,6 +157,7 @@ config IP_SET_HASH_NET
config IP_SET_HASH_NETNET
tristate "hash:net,net set support"
depends on IP_SET
+ select IP_SET_HASH
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.
@@ -154,6 +167,7 @@ config IP_SET_HASH_NETNET
config IP_SET_HASH_NETPORT
tristate "hash:net,port set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:net,port set type support, by which
one can store IPv4/IPv6 network address/prefix and
@@ -164,6 +178,7 @@ config IP_SET_HASH_NETPORT
config IP_SET_HASH_NETIFACE
tristate "hash:net,iface set support"
depends on IP_SET
+ select IP_SET_HASH
help
This option adds the hash:net,iface set type support, by which
one can store IPv4/IPv6 network address/prefix and
--
2.23.0.rc1
