fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-12-26 12:54:23 +08:00
commit ef2b4acf17
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/kernel/linux/modules/netsupport.mk
View File

@ -926,11 +926,9 @@ $(eval $(call KernelPackage,sched))
define KernelPackage/tcp-bbr define KernelPackage/tcp-bbr
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=BBR TCP congestion control TITLE:=BBR TCP congestion control
KCONFIG:= \ KCONFIG:=CONFIG_TCP_CONG_BBR
CONFIG_TCP_CONG_ADVANCED=y \
CONFIG_TCP_CONG_BBR
FILES:=$(LINUX_DIR)/net/ipv4/tcp_bbr.ko FILES:=$(LINUX_DIR)/net/ipv4/tcp_bbr.ko
AUTOLOAD:=$(call AutoLoad,74,tcp_bbr) AUTOLOAD:=$(call AutoProbe,tcp_bbr)
endef endef
define KernelPackage/tcp-bbr/description define KernelPackage/tcp-bbr/description
@ -949,6 +947,24 @@ endef
$(eval $(call KernelPackage,tcp-bbr)) $(eval $(call KernelPackage,tcp-bbr))
define KernelPackage/tcp-hybla
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=TCP-Hybla congestion control algorithm
KCONFIG:=CONFIG_TCP_CONG_HYBLA
FILES:=$(LINUX_DIR)/net/ipv4/tcp_hybla.ko
AUTOLOAD:=$(call AutoProbe,tcp_hybla)
endef
define KernelPackage/tcp-hybla/description
TCP-Hybla is a sender-side only change that eliminates penalization of
long-RTT, large-bandwidth connections, like when satellite legs are
involved, especially when sharing a common bottleneck with normal
terrestrial connections.
endef
$(eval $(call KernelPackage,tcp-hybla))
define KernelPackage/ax25 define KernelPackage/ax25
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=AX25 support TITLE:=AX25 support

1
target/linux/layerscape/armv7/config-5.4
View File

@ -715,7 +715,6 @@ CONFIG_SYNC_FILE=y
CONFIG_SYSFS_SYSCALL=y CONFIG_SYSFS_SYSCALL=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0

1
target/linux/layerscape/armv8_64b/config-5.4
View File

@ -894,7 +894,6 @@ CONFIG_TASKS_RCU=y
CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0

0
target/linux/rockchip/patches-5.4/104-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch → target/linux/rockchip/patches-5.4/105-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch
View File

0
target/linux/rockchip/patches-5.4/105-char-add-support-for-rockchip-hardware-random-number.patch → target/linux/rockchip/patches-5.4/106-char-add-support-for-rockchip-hardware-random-number.patch
View File

0
target/linux/rockchip/patches-5.4/106-arm64-dts-rockchip-add-hardware-random-number-genera.patch → target/linux/rockchip/patches-5.4/107-arm64-dts-rockchip-add-hardware-random-number-genera.patch
View File

1
target/linux/zynq/config-5.4
View File

@ -572,7 +572,6 @@ CONFIG_SWP_EMULATE=y
CONFIG_SYNC_FILE=y CONFIG_SYNC_FILE=y
CONFIG_SYSFS_SYSCALL=y CONFIG_SYSFS_SYSCALL=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
# CONFIG_TCP_CONG_ADVANCED is not set
# CONFIG_TEXTSEARCH is not set # CONFIG_TEXTSEARCH is not set
CONFIG_THERMAL=y CONFIG_THERMAL=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y