From: Yousong Zhou Date: Thu, 24 Dec 2020 01:35:39 +0000 (+0800) Subject: kernel: remove target specific setting of CONFIG_TCP_CONG_ADVANCED X-Git-Tag: v21.02.0-rc1~696 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d6425504310280a4cfc4f34977fb6638c1ff557b;p=openwrt%2Fstaging%2Fhauke.git kernel: remove target specific setting of CONFIG_TCP_CONG_ADVANCED The option was introduced in upstream linux commit a6484045 ("[TCP]: Do not present confusing congestion control options by default."). The option is set to y in generic config and to the moment does not incur additional size increment. Make it y for all so that packages such as kmod-tcp-bbr do not have to set it on every occasion Signed-off-by: Yousong Zhou --- diff --git a/target/linux/layerscape/armv7/config-5.4 b/target/linux/layerscape/armv7/config-5.4 index 15c3492349..019119d6db 100644 --- a/target/linux/layerscape/armv7/config-5.4 +++ b/target/linux/layerscape/armv7/config-5.4 @@ -715,7 +715,6 @@ CONFIG_SYNC_FILE=y CONFIG_SYSFS_SYSCALL=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y -# CONFIG_TCP_CONG_ADVANCED is not set CONFIG_THERMAL=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4 index dd9abca986..cd8ea82e52 100644 --- a/target/linux/layerscape/armv8_64b/config-5.4 +++ b/target/linux/layerscape/armv8_64b/config-5.4 @@ -894,7 +894,6 @@ CONFIG_TASKS_RCU=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_XACCT=y -# CONFIG_TCP_CONG_ADVANCED is not set CONFIG_THERMAL=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4 index 5b7b0ebfb3..04fde2add2 100644 --- a/target/linux/zynq/config-5.4 +++ b/target/linux/zynq/config-5.4 @@ -572,7 +572,6 @@ CONFIG_SWP_EMULATE=y CONFIG_SYNC_FILE=y CONFIG_SYSFS_SYSCALL=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set # CONFIG_TEXTSEARCH is not set CONFIG_THERMAL=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y