[kernel] r5953 - in dists/trunk/linux-2.6/debian/arch: alpha amd64
arm armeb hppa i386 ia64 m68k powerpc sparc
Bastian Blank
waldi at costa.debian.org
Tue Feb 21 12:12:54 UTC 2006
Author: waldi
Date: Tue Feb 21 12:12:48 2006
New Revision: 5953
Modified:
dists/trunk/linux-2.6/debian/arch/alpha/config
dists/trunk/linux-2.6/debian/arch/amd64/config
dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
dists/trunk/linux-2.6/debian/arch/arm/config.rpc
dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
dists/trunk/linux-2.6/debian/arch/hppa/config
dists/trunk/linux-2.6/debian/arch/i386/config
dists/trunk/linux-2.6/debian/arch/ia64/config
dists/trunk/linux-2.6/debian/arch/m68k/config
dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
dists/trunk/linux-2.6/debian/arch/m68k/config.atari
dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
dists/trunk/linux-2.6/debian/arch/m68k/config.hp
dists/trunk/linux-2.6/debian/arch/m68k/config.mac
dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
dists/trunk/linux-2.6/debian/arch/m68k/config.q40
dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
dists/trunk/linux-2.6/debian/arch/sparc/config
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
Log:
debian/arch: Unify general network options.
Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config Tue Feb 21 12:12:48 2006
@@ -342,27 +342,9 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
# CONFIG_IP_TCPDIAG is not set
# CONFIG_IP_TCPDIAG_IPV6 is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
CONFIG_BRIDGE_NETFILTER=y
CONFIG_DECNET_NF_GRABULATOR=m
CONFIG_BRIDGE_NF_EBTABLES=m
Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config Tue Feb 21 12:12:48 2006
@@ -361,21 +361,7 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
CONFIG_IP_TCPDIAG=m
CONFIG_IP_TCPDIAG_IPV6=y
CONFIG_IP_SCTP=m
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Tue Feb 21 12:12:48 2006
@@ -178,16 +178,12 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
CONFIG_IP_PNP_BOOTP=y
@@ -195,34 +191,17 @@
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
#
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-# CONFIG_IPV6 is not set
# CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx Tue Feb 21 12:12:48 2006
@@ -180,55 +180,21 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
-CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
#
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
#
# IP: Virtual Server Configuration
@@ -245,7 +211,6 @@
#
# IPVS application helper
#
-# CONFIG_IPV6 is not set
CONFIG_BRIDGE_NETFILTER=y
#
@@ -261,7 +226,6 @@
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.nslu2 (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.nslu2 Tue Feb 21 12:12:48 2006
@@ -209,34 +209,14 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
-CONFIG_NET_IPGRE=m
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
#
# IP: Virtual Server Configuration
@@ -253,7 +233,6 @@
#
# IPVS application helper
#
-# CONFIG_IPV6 is not set
CONFIG_BRIDGE_NETFILTER=y
#
@@ -273,7 +252,6 @@
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc Tue Feb 21 12:12:48 2006
@@ -162,54 +162,27 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
#
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_IPV6=m
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_IPV6_TUNNEL is not set
# CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410 (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410 Tue Feb 21 12:12:48 2006
@@ -192,52 +192,28 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
#
# TCP congestion control
#
CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-# CONFIG_IPV6 is not set
# CONFIG_NETFILTER is not set
#
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2 (original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2 Tue Feb 21 12:12:48 2006
@@ -209,34 +209,14 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
-CONFIG_NET_IPGRE=m
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
#
# IP: Virtual Server Configuration
@@ -253,7 +233,6 @@
#
# IPVS application helper
#
-# CONFIG_IPV6 is not set
CONFIG_BRIDGE_NETFILTER=y
#
@@ -273,7 +252,6 @@
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config Tue Feb 21 12:12:48 2006
@@ -216,34 +216,14 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_NET=y
CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
CONFIG_IP_PNP_BOOTP=y
# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
CONFIG_IP_TCPDIAG=m
CONFIG_IP_TCPDIAG_IPV6=y
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_TUNNEL=m
CONFIG_BRIDGE_NETFILTER=y
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -265,8 +245,6 @@
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
CONFIG_BRIDGE=m
Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config Tue Feb 21 12:12:48 2006
@@ -454,21 +454,7 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
CONFIG_IP_TCPDIAG=m
CONFIG_IP_TCPDIAG_IPV6=y
CONFIG_IP_SCTP=m
Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config Tue Feb 21 12:12:48 2006
@@ -316,24 +316,10 @@
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
CONFIG_IP_TCPDIAG=m
CONFIG_IP_TCPDIAG_IPV6=y
-CONFIG_IPV6=m
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
CONFIG_BRIDGE_NETFILTER=y
CONFIG_DECNET_NF_GRABULATOR=m
CONFIG_BRIDGE_NF_EBTABLES=m
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config Tue Feb 21 12:12:48 2006
@@ -73,29 +73,10 @@
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_SCSI_DEBUG is not set
CONFIG_MD=y
-CONFIG_NET=y
CONFIG_NET_KEY=y
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
CONFIG_IP_TCPDIAG=y
# CONFIG_IP_TCPDIAG_IPV6 is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_XFRM=y
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga Tue Feb 21 12:12:48 2006
@@ -81,7 +81,6 @@
# CONFIG_CD_NO_IDESCSI is not set
# CONFIG_IEEE1394 is not set
# CONFIG_IP_PNP is not set
-CONFIG_XFRM_USER=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari Tue Feb 21 12:12:48 2006
@@ -44,7 +44,6 @@
# CONFIG_SCSI_PPA is not set
# CONFIG_SCSI_IMM is not set
# CONFIG_IP_PNP is not set
-CONFIG_XFRM_USER=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000 (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000 Tue Feb 21 12:12:48 2006
@@ -27,7 +27,6 @@
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
-CONFIG_XFRM_USER=m
# CONFIG_IPX is not set
# CONFIG_DEV_APPLETALK is not set
CONFIG_NET_ETHERNET=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp Tue Feb 21 12:12:48 2006
@@ -24,7 +24,6 @@
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
-CONFIG_XFRM_USER=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac Tue Feb 21 12:12:48 2006
@@ -48,7 +48,6 @@
CONFIG_INPUT_ADBHID=y
CONFIG_MAC_EMUMOUSEBTN=y
# CONFIG_IP_PNP is not set
-CONFIG_XFRM_USER=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
CONFIG_DEV_APPLETALK=y
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147 (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147 Tue Feb 21 12:12:48 2006
@@ -24,7 +24,6 @@
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
-CONFIG_XFRM_USER=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x Tue Feb 21 12:12:48 2006
@@ -27,7 +27,6 @@
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
-CONFIG_XFRM_USER=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40 (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40 Tue Feb 21 12:12:48 2006
@@ -55,7 +55,6 @@
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
-# CONFIG_XFRM_USER is not set
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3 (original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3 Tue Feb 21 12:12:48 2006
@@ -11,7 +11,6 @@
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
CONFIG_IP_PNP_RARP=y
-# CONFIG_XFRM_USER is not set
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
# CONFIG_DEV_APPLETALK is not set
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot Tue Feb 21 12:12:48 2006
@@ -20,7 +20,6 @@
# CONFIG_LBD is not set
# CONFIG_THERM_WINDTUNNEL is not set
# CONFIG_THERM_ADT746X is not set
-# CONFIG_IPV6_TUNNEL is not set
# CONFIG_NETFILTER is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_NET_SCHED is not set
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config Tue Feb 21 12:12:48 2006
@@ -93,17 +93,9 @@
# CONFIG_IP_PNP_BOOTP is not set
CONFIG_IP_PNP_RARP=y
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
CONFIG_IP_TCPDIAG=m
CONFIG_IP_TCPDIAG_IPV6=y
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
CONFIG_BRIDGE_NETFILTER=y
CONFIG_DECNET_NF_GRABULATOR=m
CONFIG_BRIDGE_NF_EBTABLES=m
@@ -361,11 +353,6 @@
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_CRC_CCITT=m
CONFIG_CRC32=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_HZ=250
# CONFIG_HZ_1000 is not set
# CONFIG_HZ_100 is not set
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32 (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32 Tue Feb 21 12:12:48 2006
@@ -113,49 +113,22 @@
#
# Networking
#
-CONFIG_NET=y
#
# Networking options
#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_BOOTP is not set
CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
#
# TCP congestion control
#
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
#
# IP: Virtual Server Configuration
@@ -172,13 +145,6 @@
#
# IPVS application helper
#
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_TUNNEL=m
CONFIG_BRIDGE_NETFILTER=y
#
@@ -226,7 +192,6 @@
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
#
# DCCP CCIDs Configuration (EXPERIMENTAL)
More information about the Kernel-svn-changes
mailing list