Author: maks Date: Mon May 21 19:56:50 2007 New Revision: 8682 Log: explicitly disable some experimental networking options they default to no anyway beautify ipv6 options, regroup them
Modified: dists/trunk/linux-2.6/debian/arch/config Modified: dists/trunk/linux-2.6/debian/arch/config ============================================================================== --- dists/trunk/linux-2.6/debian/arch/config (original) +++ dists/trunk/linux-2.6/debian/arch/config Mon May 21 19:56:50 2007 @@ -413,7 +413,9 @@ # CONFIG_XFRM=y CONFIG_XFRM_USER=m +# CONFIG_XFRM_MIGRATE is not set CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -490,11 +492,22 @@ CONFIG_IP_VS_FTP=m CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set +CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -816,11 +829,9 @@ CONFIG_W1_SLAVE_DS2433=m CONFIG_GIGASET_BASE=m CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_INET6_XFRM_TUNNEL=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_NEW_LEDS=y CONFIG_RTC_DRV_M48T86=m -# CONFIG_IPV6_ROUTER_PREF is not set CONFIG_SND_RIPTIDE=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_WM8775=m @@ -940,7 +951,6 @@ CONFIG_JFFS2_FS_POSIX_ACL=y # CONFIG_RT_MUTEX_TESTER is not set CONFIG_RTC_DRV_DS1553=m -CONFIG_NETWORK_SECMARK=y CONFIG_PC8736x_GPIO=m CONFIG_LOCKDEP_SUPPORT=y CONFIG_DVB_USB_GP8PSK=m @@ -980,7 +990,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_SND_GINA20=m CONFIG_VITESSE_PHY=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_SND_GINA24=m CONFIG_VIDEO_TLV320AIC23B=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m @@ -999,7 +1008,6 @@ CONFIG_SND_MIA=m CONFIG_MCS_FIR=m # CONFIG_IPW2200_PROMISCUOUS is not set -CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_INFINIBAND_ISER=m @@ -1102,7 +1110,6 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_VIDEO_TDA9875=m CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_DEFAULT_TCP_CONG="bic" CONFIG_VIDEO_SAA7110=m @@ -1116,7 +1123,6 @@ CONFIG_EXT4DEV_FS_POSIX_ACL=y CONFIG_USB_U132_HCD=m CONFIG_DVB_TUA6100=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_ECRYPT_FS=m CONFIG_SND_MTS64=m CONFIG_NETFILTER_XT_TARGET_DSCP=m @@ -1140,7 +1146,6 @@ CONFIG_USB_SERIAL_MOS7720=m CONFIG_VIDEO_KS0127=m CONFIG_BLK_DEV_JMICRON=m -# CONFIG_IPV6_MIP6 is not set # CONFIG_DEFAULT_CUBIC is not set CONFIG_PATA_RADISYS=m # CONFIG_IPC_NS is not set @@ -1167,7 +1172,6 @@ CONFIG_MSI_LAPTOP=m CONFIG_SONY_LAPTOP=m CONFIG_USB_PHIDGETMOTORCONTROL=m -CONFIG_IPV6_SIT=m CONFIG_GFS2_FS_LOCKING_DLM=m CONFIG_FIB_RULES=y CONFIG_CRYPTO_TWOFISH_COMMON=m @@ -1205,7 +1209,6 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DVB_TUNER_QT1010=m CONFIG_DVB_TUNER_MT2060=m -CONFIG_INET6_XFRM_MODE_BEET=m CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_USB_TRANCEVIBRATOR=m _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes