[kernel] r17625 - in dists/sid/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Tue Jun  7 11:10:04 2011
New Revision: 17625

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/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Jun  7 11:06:44 2011	(r17624)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jun  7 11:10:04 2011	(r17625)
@@ -33,6 +33,10 @@
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
   * Bump ABI to 2
+  * 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
 
   [ Aurelien Jarno ]
   * [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Tue Jun  7 11:06:44 2011	(r17624)
+++ dists/sid/linux-2.6/debian/config/config	Tue Jun  7 11:10:04 2011	(r17625)
@@ -3941,6 +3941,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
@@ -4001,6 +4002,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