kernel: switch openwrt default to TCP cubic from westwood (patch by Dave Täht)

[openwrt/staging/wigyori.git] / target / linux / generic / config-3.3

diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index aef75a3aa3df6bc81df235e6d6ed33d5010dae36..2ddce18c4fd97cf9c02d8f98237ce53e66512f95 100644 (file)
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -47,6 +47,7 @@ CONFIG_ANON_INODES=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CNS3XXX is not set
 # CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 # CONFIG_ARCH_DOVE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
@@ -55,6 +56,8 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ARCH_HIGHBANK is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IOP13XX is not set
@@ -76,6 +79,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_NUC93X is not set
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 # CONFIG_ARCH_PICOXCELL is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PRIMA2 is not set
@@ -90,6 +94,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_SHMOBILE is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_ARCH_TCC_926 is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U300 is not set
@@ -287,6 +292,7 @@ CONFIG_BLOCK=y
 CONFIG_BOOT_RAW=y
 # CONFIG_BPQETHER is not set
 CONFIG_BQL=y
+CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMFMAC is not set
 CONFIG_BRIDGE=y
 # CONFIG_BRIDGE_EBT_802_3 is not set
@@ -525,6 +531,7 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_ICEDCC is not set
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_INFO_REDUCED=y
@@ -568,8 +575,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_TCP_CONG="westwood"
-CONFIG_DEFAULT_WESTWOOD=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
@@ -646,6 +653,7 @@ CONFIG_EPOLL=y
 # CONFIG_ETH16I is not set
 CONFIG_ETHERNET=y
 # CONFIG_ETHOC is not set
+# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
 CONFIG_EVENTFD=y
 # CONFIG_EWRK3 is not set
 CONFIG_EXPERIMENTAL=y
@@ -774,6 +782,7 @@ CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -904,6 +913,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_HVC_UDBG is not set
 # CONFIG_HWMON is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWSPINLOCK_OMAP is not set
 # CONFIG_HW_RANDOM is not set
@@ -959,6 +969,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_PCA_ISA is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SCMI is not set
 # CONFIG_I2C_SIS5595 is not set
@@ -1307,6 +1318,7 @@ CONFIG_LBDAF=y
 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_GPIO_OF=y
 CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_INTEL_SS4200 is not set
@@ -1315,6 +1327,7 @@ CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_NET5501 is not set
 # CONFIG_LEDS_OT200 is not set
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
@@ -1443,6 +1456,7 @@ CONFIG_MII=y
 # CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
 # CONFIG_MIPS_ALCHEMY is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIPS_FPU_EMU is not set
@@ -1460,6 +1474,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN_W6692 is not set
 # CONFIG_MKISS is not set
 # CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
 # CONFIG_MMC is not set
 # CONFIG_MMC_ARMMMCI is not set
 # CONFIG_MMC_BLOCK is not set
@@ -1773,11 +1788,13 @@ CONFIG_NET_SCHED=y
 # CONFIG_NET_SCH_ATM is not set
 # CONFIG_NET_SCH_CBQ is not set
 # CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_CODEL is not set
 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NET_SCH_DSMARK is not set
 # CONFIG_NET_SCH_ESFQ is not set
 CONFIG_NET_SCH_ESFQ_NFCT=y
 CONFIG_NET_SCH_FIFO=y
+# CONFIG_NET_SCH_FQ_CODEL is not set
 # CONFIG_NET_SCH_GRED is not set
 # CONFIG_NET_SCH_HFSC is not set
 # CONFIG_NET_SCH_HTB is not set
@@ -2117,6 +2134,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_POWERTV is not set
 # CONFIG_POWER_SUPPLY is not set
+# CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PPC4xx_GPIO is not set
 # CONFIG_PPC_16K_PAGES is not set
 # CONFIG_PPC_256K_PAGES is not set
@@ -2147,11 +2165,14 @@ CONFIG_PRINTK=y
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_PRISM54 is not set
+# CONFIG_PSB6970_PHY is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILING is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_PROVE_RCU is not set
@@ -2163,6 +2184,7 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTA_DEBUG is not set
+# CONFIG_QUOTACTL is not set
 # CONFIG_R3964 is not set
 # CONFIG_R6040 is not set
 # CONFIG_R8169 is not set
@@ -2218,6 +2240,7 @@ CONFIG_RD_LZMA=y
 # CONFIG_RFD_FTL is not set
 # CONFIG_RFKILL is not set
 # CONFIG_RFKILL_INPUT is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_ROSE is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
@@ -2289,8 +2312,8 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8306_PHY is not set
 # CONFIG_RTL8366RB_PHY is not set
 # CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
 # CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366_SMI_DEBUG_FS is not set
 # CONFIG_RTL8367_PHY is not set
 # CONFIG_RTS_PSTOR is not set
 CONFIG_RT_MUTEXES=y
@@ -2407,6 +2430,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_U14_34F is not set
 # CONFIG_SCSI_ULTRASTOR is not set
 CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SDIO_UART is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
@@ -2498,6 +2522,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
 # CONFIG_SENSORS_SCH5627 is not set
 # CONFIG_SENSORS_SCH5636 is not set
 # CONFIG_SENSORS_SHT15 is not set
@@ -2556,9 +2581,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIO is not set
+# CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_I8042 is not set
+# CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_SERPORT is not set
 # CONFIG_SFC is not set
 # CONFIG_SFI is not set
 # CONFIG_SGI_IOC4 is not set
@@ -2764,11 +2795,13 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI is not set
 # CONFIG_SPINLOCK_TEST is not set
 # CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_FSL_ESPI is not set
+# CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_MASTER is not set
@@ -2843,7 +2876,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TCIC is not set
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
-# CONFIG_TCP_CONG_CUBIC is not set
+CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_HSTCP is not set
 # CONFIG_TCP_CONG_HTCP is not set
 # CONFIG_TCP_CONG_HYBLA is not set
@@ -2852,7 +2885,7 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_SCALABLE is not set
 # CONFIG_TCP_CONG_VEGAS is not set
 # CONFIG_TCP_CONG_VENO is not set
-CONFIG_TCP_CONG_WESTWOOD=y
+# CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_YEAH is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_TEHUTI is not set