---

yaml --- r: 236847 b: refs/heads/master c: 21f4502 h: refs/heads/master i: 236845: 2a1474b 236843: e58328d 236839: 62e1040 236831: 2aadb29 v: v3
git-mirror · Feb 1, 2011 · 4684055 · 4684055
1 parent 351a347
commit 4684055
Show file tree

Hide file tree

Showing 4 changed files with 593 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b38370299eeaba4cf8a9e0c5c6acc2a1e049be23
+refs/heads/master: 21f45020a3084f80fcdd5f056a0c6389f5406399
diff --git a/trunk/net/netfilter/ipset/Kconfig b/trunk/net/netfilter/ipset/Kconfig
@@ -98,4 +98,14 @@ config IP_SET_HASH_NET
 
 	  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
+	help
+	  This option adds the hash:net,port set type support, by which
+	  one can store IPv4/IPv6 network address/prefix and
+	  protocol/port pairs as elements in a set.
+
+	  To compile it as a module, choose M here.  If unsure, say N.
+
 endif # IP_SET
diff --git a/trunk/net/netfilter/ipset/Makefile b/trunk/net/netfilter/ipset/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_IP_SET_HASH_IPPORT) += ip_set_hash_ipport.o
 obj-$(CONFIG_IP_SET_HASH_IPPORTIP) += ip_set_hash_ipportip.o
 obj-$(CONFIG_IP_SET_HASH_IPPORTNET) += ip_set_hash_ipportnet.o
 obj-$(CONFIG_IP_SET_HASH_NET) += ip_set_hash_net.o
+obj-$(CONFIG_IP_SET_HASH_NETPORT) += ip_set_hash_netport.o