From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 21 Aug 2006 20:43:56 +0000 (+0000)
Subject: build VLAN support
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=de2460e097f760788d89c1035189673f1bf52717;p=linux-2.6.git

build VLAN support
---

diff --git a/configs/kernel-2.6.17-i686-planetlab.config b/configs/kernel-2.6.17-i686-planetlab.config
index 30a5fdb2c..3d0b18a22 100644
--- a/configs/kernel-2.6.17-i686-planetlab.config
+++ b/configs/kernel-2.6.17-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17-1.2142_FC4-1.planetlab
-# Wed Jul 26 16:17:45 2006
+# Mon Aug 21 16:39:45 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -442,7 +442,7 @@ CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
@@ -879,6 +879,7 @@ CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
+# CONFIG_R8169_VLAN is not set
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 CONFIG_SKY2=m
diff --git a/configs/kernel-2.6.17-i686-smp-planetlab.config b/configs/kernel-2.6.17-i686-smp-planetlab.config
index 61c0f7ce4..e4887618c 100644
--- a/configs/kernel-2.6.17-i686-smp-planetlab.config
+++ b/configs/kernel-2.6.17-i686-smp-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17-1.2142_FC4-1.planetlab
-# Thu Jul 27 19:38:34 2006
+# Mon Aug 21 16:40:40 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -449,7 +449,7 @@ CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
@@ -886,6 +886,7 @@ CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
+# CONFIG_R8169_VLAN is not set
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 CONFIG_SKY2=m
diff --git a/configs/kernel-2.6.17-i686-uml-planetlab.config b/configs/kernel-2.6.17-i686-uml-planetlab.config
index d97761915..0063aa478 100644
--- a/configs/kernel-2.6.17-i686-uml-planetlab.config
+++ b/configs/kernel-2.6.17-i686-uml-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-1.2142_FC4.1uml
-# Fri Jul 28 02:00:19 2006
+# Linux kernel version: 2.6.17-1.2142_FC4-1.planetlab
+# Mon Aug 21 16:42:30 2006
 #
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_UML=y
@@ -382,7 +382,7 @@ CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set