From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 28 Jan 2005 01:49:46 +0000 (+0000)
Subject: - merge revision 1.19
X-Git-Tag: planetlab-3_0-rc10~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bbf2d2a2c27dca807e120c705534879584c5ecea;p=linux-2.6.git

- merge revision 1.19
date: 2005/01/10 20:31:05;  author: mlhuang;  state: Exp;  lines: +5 -0
compile PPTP/GRE connection tracking modules
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index ea66387e5..3e2bddda0 100644
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -540,6 +540,11 @@ CONFIG_IP_NF_TARGET_NOTRACK=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_CT_ACCT 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
 
 #
 # SCTP Configuration (EXPERIMENTAL)