diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 03e4fb66e..1a40ace88 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=36 +PKG_RELEASE:=37 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/arm/index.htm b/package/lean/autocore/files/arm/index.htm index 4f884744e..e55a70799 100644 --- a/package/lean/autocore/files/arm/index.htm +++ b/package/lean/autocore/files/arm/index.htm @@ -142,7 +142,9 @@ .format(bss[p+'rate'] / 1000, bss[p+'mhz']), ht = bss[p+'ht'], vht = bss[p+'vht'], mhz = bss[p+'mhz'], nss = bss[p+'nss'], - mcs = bss[p+'mcs'], sgi = bss[p+'short_gi']; + mcs = bss[p+'mcs'], sgi = bss[p+'short_gi'], + he = bss[p+'he'], he_gi = bss[p+'he_gi'], + he_dcm = bss[p+'he_dcm']; if (ht || vht) { if (vht) s += ', VHT-MCS %d'.format(mcs); @@ -150,6 +152,13 @@ if (ht) s += ', MCS %s'.format(mcs); if (sgi) s += ', <%:Short GI%>'; } + + if (he) { + s += ', HE-MCS %d'.format(mcs); + if (nss) s += ', HE-NSS %d'.format(nss); + if (he_gi) s += ', HE-GI %d'.format(he_gi); + if (he_dcm) s += ', HE-DCM %d'.format(he_dcm); + } return s; } diff --git a/package/lean/autocore/files/x86/index.htm b/package/lean/autocore/files/x86/index.htm index c24224cb3..cd63bf02c 100644 --- a/package/lean/autocore/files/x86/index.htm +++ b/package/lean/autocore/files/x86/index.htm @@ -146,7 +146,9 @@ .format(bss[p+'rate'] / 1000, bss[p+'mhz']), ht = bss[p+'ht'], vht = bss[p+'vht'], mhz = bss[p+'mhz'], nss = bss[p+'nss'], - mcs = bss[p+'mcs'], sgi = bss[p+'short_gi']; + mcs = bss[p+'mcs'], sgi = bss[p+'short_gi'], + he = bss[p+'he'], he_gi = bss[p+'he_gi'], + he_dcm = bss[p+'he_dcm']; if (ht || vht) { if (vht) s += ', VHT-MCS %d'.format(mcs); @@ -154,6 +156,13 @@ if (ht) s += ', MCS %s'.format(mcs); if (sgi) s += ', <%:Short GI%>'; } + + if (he) { + s += ', HE-MCS %d'.format(mcs); + if (nss) s += ', HE-NSS %d'.format(nss); + if (he_gi) s += ', HE-GI %d'.format(he_gi); + if (he_dcm) s += ', HE-DCM %d'.format(he_dcm); + } return s; } diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index de1d6d4df..0c8a43229 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -10,7 +10,7 @@ BOARDNAME:=x86 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu boot-part rootfs-part SUBTARGETS:=64 generic legacy geode -KERNEL_PATCHVER:=5.10 +KERNEL_PATCHVER:=5.4 KERNEL_TESTING_PATCHVER:=5.10 KERNELNAME:=bzImage @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug wpad kmod-usb-hid kmod-mmc-spi kmod-sdhci \ kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs \ -htop lm-sensors autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates luci-app-jd-dailybonus luci-app-uugamebooster \ +htop lm-sensors autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-certificates luci-app-uugamebooster \ ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-mlx4-core kmod-mlx5-core