From f4a2d145ef0e08cb0863be2cb45a1ec7078440e3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 30 May 2011 20:07:47 +0000 Subject: [PATCH] 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 svn path=/dists/trunk/linux-2.6/; revision=17489 --- debian/changelog | 4 ++++ debian/config/config | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5e202bc4f..b3ced4e48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ linux-2.6 (3.0~rc1-1~experimental.1) UNRELEASED; urgency=low 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 Sat, 21 May 2011 22:13:08 +0100 diff --git a/debian/config/config b/debian/config/config index e6d225072..72c244f61 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3945,6 +3945,7 @@ CONFIG_NF_CONNTRACK_TFTP=m 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 @@ -4004,6 +4005,22 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m 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 ##