From 5f22a5ed5660e50a9fe05af55a5af48354a74e62 Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 2 Mar 2007 13:56:21 +0000 Subject: [PATCH] Branch HEAD Enable CONFIG_E1000_DISABLE_PACKET_SPLIT to match b1_4. Enable CONFIG_IPV6=m in UML kernel so that tcp symbols are exported. --- .../kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config | 2 +- .../kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config | 2 +- .../kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config | 2 +- lustre/kernel_patches/kernel_configs/uml-vanilla-2.4.24.config | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config index 86501ac..7d0ceb4 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config @@ -867,7 +867,7 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000_DISABLE_PACKET_SPLIT=y # CONFIG_MYRI_SBUS is not set CONFIG_NS83820=m CONFIG_HAMACHI=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config index 2e3bad9..ff4b0d1 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config @@ -716,7 +716,7 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000_DISABLE_PACKET_SPLIT=y # CONFIG_MYRI_SBUS is not set CONFIG_NS83820=m CONFIG_HAMACHI=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config index c755460..0d9818a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config @@ -777,7 +777,7 @@ CONFIG_ACENIC=m CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000_DISABLE_PACKET_SPLIT=y # CONFIG_MYRI_SBUS is not set CONFIG_NS83820=m CONFIG_HAMACHI=m diff --git a/lustre/kernel_patches/kernel_configs/uml-vanilla-2.4.24.config b/lustre/kernel_patches/kernel_configs/uml-vanilla-2.4.24.config index 01b7fa8..2803866 100644 --- a/lustre/kernel_patches/kernel_configs/uml-vanilla-2.4.24.config +++ b/lustre/kernel_patches/kernel_configs/uml-vanilla-2.4.24.config @@ -131,7 +131,7 @@ CONFIG_INET=y # CONFIG_ARPD is not set # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set -# CONFIG_IPV6 is not set +CONFIG_IPV6=m # CONFIG_KHTTPD is not set # -- 1.8.3.1