From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 22 Feb 2006 21:23:20 +0000 (+0000)
Subject: - add IP set support from patch-o-matic-ng-20051203
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~58
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=13e2534a76deec12ba2c9c024c6210ef49072997;p=linux-2.6.git

- add IP set support from patch-o-matic-ng-20051203
---

diff --git a/configs/kernel-2.6.12-i686-xenU-planetlab.config b/configs/kernel-2.6.12-i686-xenU-planetlab.config
index 047237ddf..c40e9909b 100644
--- a/configs/kernel-2.6.12-i686-xenU-planetlab.config
+++ b/configs/kernel-2.6.12-i686-xenU-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-1.1_1390_FC4.1.planetlab
-# Wed Sep  7 22:43:27 2005
+# Linux kernel version: 2.6.12-1.1398_FC4.5.planetlab
+# Wed Feb 22 16:22:48 2006
 #
 CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
@@ -417,7 +417,22 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-# CONFIG_IP_NF_CT_PROTO_GRE is not set
+CONFIG_IP_NF_CT_PROTO_GRE=m
+CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_PROTO_GRE=m
+CONFIG_IP_NF_SET=m
+CONFIG_IP_NF_SET_MAX=256
+CONFIG_IP_NF_SET_HASHSIZE=1024
+CONFIG_IP_NF_SET_IPMAP=m
+CONFIG_IP_NF_SET_MACIPMAP=m
+CONFIG_IP_NF_SET_PORTMAP=m
+CONFIG_IP_NF_SET_IPHASH=m
+CONFIG_IP_NF_SET_NETHASH=m
+CONFIG_IP_NF_SET_IPPORTHASH=m
+CONFIG_IP_NF_SET_IPTREE=m
+CONFIG_IP_NF_MATCH_SET=m
+CONFIG_IP_NF_TARGET_SET=m
 
 #
 # IPv6: Netfilter Configuration (EXPERIMENTAL)