[kernel] r17489 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Mon May 30 20:07:47 2011
New Revision: 17489

Log:
netfilter: Enable IP_SET etc. as modules

Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 30 20:00:37 2011	(r17488)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 20:07:47 2011	(r17489)
@@ -15,6 +15,10 @@
     CGROUP_MEM_RES_CTLR_SWAP_ENABLED. Swap accounting can be enabled
     using kernel parameter 'swapaccount'.
   * ipv4: Enable IP_FIB_TRIE_STATS
+  * netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
+    IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
+    IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
+    IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 30 20:00:37 2011	(r17488)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 30 20:07:47 2011	(r17489)
@@ -3945,6 +3945,7 @@
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -4005,6 +4006,22 @@
 CONFIG_NETFILTER_XT_MATCH_U32=m
 
 ##
+## file: net/netfilter/ipset/Kconfig
+##
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
+
+##
 ## file: net/netfilter/ipvs/Kconfig
 ##
 CONFIG_IP_VS=m