---

yaml --- r: 236840 b: refs/heads/master c: de76021 h: refs/heads/master v: v3
git-mirror · Feb 1, 2011 · 75121fa · 75121fa
1 parent 62e1040
commit 75121fa
Show file tree

Hide file tree

Showing 4 changed files with 666 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72205fc68bd13109576aa6c4c12c740962d28a6c
+refs/heads/master: de76021a1bb35e3560afccf741d1119a872aea49
diff --git a/trunk/net/netfilter/ipset/Kconfig b/trunk/net/netfilter/ipset/Kconfig
@@ -32,4 +32,13 @@ config IP_SET_BITMAP_IP
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+config IP_SET_BITMAP_IPMAC
+	tristate "bitmap:ip,mac set support"
+	depends on IP_SET
+	help
+	  This option adds the bitmap:ip,mac set type support, by which one
+	  can store IPv4 address and (source) MAC address pairs from a range.
+
+	  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
@@ -9,3 +9,4 @@ obj-$(CONFIG_IP_SET) += ip_set.o
 
 # bitmap types
 obj-$(CONFIG_IP_SET_BITMAP_IP) += ip_set_bitmap_ip.o
+obj-$(CONFIG_IP_SET_BITMAP_IPMAC) += ip_set_bitmap_ipmac.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ obj-$(CONFIG_IP_SET) += ip_set.o

		# bitmap types
		obj-$(CONFIG_IP_SET_BITMAP_IP) += ip_set_bitmap_ip.o
		obj-$(CONFIG_IP_SET_BITMAP_IPMAC) += ip_set_bitmap_ipmac.o