[kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

[openwrt.git] / target / linux / generic / config-2.6.32

diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32
index da93d60..09c9d04 100644 (file)
--- a/target/linux/generic/config-2.6.32
+++ b/target/linux/generic/config-2.6.32
@@ -11,6 +11,7 @@
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADM6996_PHY is not set
 # CONFIG_ADM8211 is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ADM6996_PHY is not set
 # CONFIG_ADM8211 is not set

+CONFIG_AEABI=y

 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set


@@ -364,8 +365,8 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_AEAD is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_AEAD is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set

-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ALGAPI is not set
+# CONFIG_CRYPTO_ALGAPI2 is not set

 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set


@@ -406,7 +407,8 @@ CONFIG_CRYPTO_MANAGER_NO_TESTS=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set

-CONFIG_CRYPTO_PCOMP=y
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set

 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set


@@ -427,12 +429,11 @@ CONFIG_CRYPTO_PCOMP=y
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set

-CONFIG_CRYPTO_UNLZMA=y

 # CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set

-CONFIG_CRYPTO_ZLIB=y
+# CONFIG_CRYPTO_ZLIB is not set

 # CONFIG_CUSE is not set
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_CUSE is not set
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set


@@ -446,6 +447,7 @@ CONFIG_CRYPTO_ZLIB=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set

+# CONFIG_DEBUG_ICEDCC is not set

 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_KMEMLEAK is not set


@@ -458,13 +460,16 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_OBJECTS is not set

+# CONFIG_DEBUG_PAGEALLOC is not set

 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_PREEMPT is not set

+# CONFIG_DEBUG_RODATA is not set

 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set

+# CONFIG_DEBUG_STACKOVERFLOW is not set

 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set


@@ -551,6 +556,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_EXT4_DEBUG is not set
 # CONFIG_EXT4_FS is not set
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_EXT4_DEBUG is not set
 # CONFIG_EXT4_FS is not set

+# CONFIG_EXT4_FS_SECURITY is not set

 # CONFIG_EXT4_FS_XATTR is not set
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_EXT4_FS_XATTR is not set
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXTRA_FIRMWARE=""


@@ -852,12 +858,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set

-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2

 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set


@@ -1121,11 +1121,20 @@ CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set

+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set

 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8323 is not set

+# CONFIG_KEYBOARD_MATRIX is not set

 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set

+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_NEWTON is not set

 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYBOARD_OPENCORES is not set

+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set

 # CONFIG_KEYS is not set
 # CONFIG_KGDB is not set
 # CONFIG_KEYS is not set
 # CONFIG_KGDB is not set

+# CONFIG_KMEMCHECK is not set

 # CONFIG_KMEMTRACE is not set
 CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_KMEMTRACE is not set
 CONFIG_KMOD=y
 # CONFIG_KPROBES is not set


@@ -1152,11 +1161,12 @@ CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set

-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set

 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGER_TIMER=y

+# CONFIG_LEDS_TRIGGER_USBDEV is not set

 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_LIB80211 is not set
 # CONFIG_LIB80211_CRYPT_CCMP is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_LIB80211 is not set
 # CONFIG_LIB80211_CRYPT_CCMP is not set


@@ -1265,6 +1275,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MOUSE_APPLETOUCH is not set

+# CONFIG_MOUSE_GPIO is not set

 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set


@@ -1441,10 +1452,10 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set

-CONFIG_NET_ACT_SKBEDIT=y
+# CONFIG_NET_ACT_SKBEDIT is not set

 CONFIG_NET_CLS=y
 CONFIG_NET_CLS=y

-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set

 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y


@@ -1610,6 +1621,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set

+# CONFIG_OABI_COMPAT is not set

 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_OCF_C7108 is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_OCF_C7108 is not set


@@ -1774,7 +1786,7 @@ CONFIG_PRINTK=y
 # CONFIG_PRISM54 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_FS=y
 # CONFIG_PRISM54 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_FS=y

-CONFIG_PROC_KCORE=y
+# CONFIG_PROC_KCORE is not set

 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set


@@ -1856,7 +1868,9 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS3234 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_DS3234 is not set

+# CONFIG_RTC_DRV_EP93XX is not set

 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_FM3130 is not set

+# CONFIG_RTC_DRV_GENERIC is not set

 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_M41T94 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_M41T94 is not set


@@ -1869,6 +1883,8 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_PCF50606 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_PCF50606 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
 # CONFIG_RTC_DRV_PCF8583 is not set

+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set

 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set


@@ -2328,8 +2344,8 @@ CONFIG_SWAP=y
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y

-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set

 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set


@@ -2800,7 +2816,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_WIMAX is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
 # CONFIG_WIMAX is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y

-CONFIG_WIRELESS_EXT_SYSFS=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set

 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WLAN=y
 CONFIG_WLAN_80211=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WLAN=y
 CONFIG_WLAN_80211=y