From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 9 Aug 2005 19:58:14 +0000 (+0000)
Subject: turn on gre/pptp netfilter
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~176
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=00037597c8c88362a39639bfd67bd29d0ef496d5;p=linux-2.6.git

turn on gre/pptp netfilter
---

diff --git a/configs/kernel-2.6.12-i686-planetlab.config b/configs/kernel-2.6.12-i686-planetlab.config
index 163e79002..fb9056345 100644
--- a/configs/kernel-2.6.12-i686-planetlab.config
+++ b/configs/kernel-2.6.12-i686-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.2005.08.04
-# Mon Aug  8 08:02:06 2005
+# Linux kernel version: 2.6.12-1.1398_FC4.0.planetlab.2005.08.08
+# Tue Aug  9 13:24:51 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -623,8 +623,11 @@ CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IP_NF_CT_PROTO_GRE is not set
-# CONFIG_VNET 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_VNET=m
 
 #
 # SCTP Configuration (EXPERIMENTAL)