diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/120-mt7622-bl2_boot_snand-skip-bad-blocks.patch b/package/boot/arm-trusted-firmware-mediatek/patches/120-mt7622-bl2_boot_snand-skip-bad-blocks.patch new file mode 100644 index 00000000000000..31384d010ecba4 --- /dev/null +++ b/package/boot/arm-trusted-firmware-mediatek/patches/120-mt7622-bl2_boot_snand-skip-bad-blocks.patch @@ -0,0 +1,40 @@ +--- a/plat/mediatek/mt7622/bl2_boot_snand.c ++++ b/plat/mediatek/mt7622/bl2_boot_snand.c +@@ -21,6 +21,10 @@ + #define FIP_BASE 0x80000 + #define FIP_SIZE 0x200000 + ++#ifndef NMBM ++#define SNAND_MAX_BAD_BLOCK 3 ++#endif ++ + struct snfi_gpio_mux_info { + const uint32_t *pins; + uint32_t count; +@@ -45,12 +49,26 @@ static size_t snand_read_range(int lba, + size_t sizeremain = size, chunksize; + uint64_t off = lba * cinfo.pagesize; + uint8_t *ptr = (uint8_t *)buf; ++ struct mtk_snand_chip_info info; ++ unsigned int bad_blocks = 0; + int ret = 0; + + if (!snf) + return 0; + ++ ret = mtk_snand_get_chip_info(snf, &info); ++ if (ret) ++ return 0; ++ + while (sizeremain) { ++ while (mtk_snand_block_isbad(snf, off)) { ++ if (bad_blocks > SNAND_MAX_BAD_BLOCK) ++ return size - sizeremain; ++ ++ off += info.blocksize; ++ ++bad_blocks; ++ } ++ + chunksize = cinfo.pagesize; + if (chunksize > sizeremain) + chunksize = sizeremain; diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index d35b4e3b588144..7dae1af7134380 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -420,9 +420,9 @@ mac80211_hostapd_setup_base() { he_spr_non_srg_obss_pd_max_offset:1 \ he_bss_color - he_phy_cap=$(iw phy "$phy" info | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1) + he_phy_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE PHY Capabilities/ { print $2 }' | head -1) he_phy_cap=${he_phy_cap:2} - he_mac_cap=$(iw phy "$phy" info | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1) + he_mac_cap=$(iw phy "$phy" info | sed -n '/HE Iftypes: AP/,$p' | awk -F "[()]" '/HE MAC Capabilities/ { print $2 }' | head -1) he_mac_cap=${he_mac_cap:2} append base_cfg "ieee80211ax=1" "$N" diff --git a/package/lean/r8101/Makefile b/package/lean/r8101/Makefile index 484aa30361dd6c..bae42105d9f29b 100644 --- a/package/lean/r8101/Makefile +++ b/package/lean/r8101/Makefile @@ -11,8 +11,8 @@ PKG_VERSION:=1.037.01 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://github.com/umarizulkifli/r8101/blob/main/r8101-1.037.01.tar.bz2 -PKG_HASH:=45b3ae6af31054879b06c13ce4f0fb14 +PKG_SOURCE_URL:=https://github.com/umarizulkifli/r8101/raw/main/ +PKG_HASH:=62bb19848a87d2fe4de3fa9332225dcb5381f06cb93ec8931ea3fd894d492aea PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=umarizulkifli diff --git a/package/lean/vsftpd-alt/Makefile b/package/lean/vsftpd-alt/Makefile index dd3a356d4c6d39..db88e30c5f5010 100644 --- a/package/lean/vsftpd-alt/Makefile +++ b/package/lean/vsftpd-alt/Makefile @@ -48,6 +48,8 @@ endef ifneq ($(CONFIG_USE_MUSL),) NLSSTRING:=-lcrypt +else ifneq ($(CONFIG_USE_GLIBC),) + NLSSTRING:=-lcrypt else NLSSTRING:=-lcrypt -lnsl endif diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index df2587aa6cb2a8..e861323e453454 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -48,12 +48,15 @@ hostapd_append_wpa_key_mgmt() { ;; eap192) append wpa_key_mgmt "WPA-EAP-SUITE-B-192" - [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP" + [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP-SHA384" ;; eap-eap192) append wpa_key_mgmt "WPA-EAP-SUITE-B-192" append wpa_key_mgmt "WPA-EAP" - [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP" + [ "${ieee80211r:-0}" -gt 0 ] && { + append wpa_key_mgmt "FT-EAP-SHA384" + append wpa_key_mgmt "FT-EAP" + } [ "${ieee80211w:-0}" -gt 0 ] && append wpa_key_mgmt "WPA-EAP-SHA256" ;; sae) @@ -934,7 +937,11 @@ hostapd_set_bss_options() { json_get_vars ieee80211w_mgmt_cipher ieee80211w_max_timeout ieee80211w_retry_timeout append bss_conf "ieee80211w=$ieee80211w" "$N" [ "$ieee80211w" -gt "0" ] && { - append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N" + if [ "$auth_type" = "eap192" ]; then + append bss_conf "group_mgmt_cipher=BIP-GMAC-256" "$N" + else + append bss_conf "group_mgmt_cipher=${ieee80211w_mgmt_cipher:-AES-128-CMAC}" "$N" + fi [ -n "$ieee80211w_max_timeout" ] && \ append bss_conf "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N" [ -n "$ieee80211w_retry_timeout" ] && \ diff --git a/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch b/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch index d6711105da6d38..597598e8a91a8f 100644 --- a/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch +++ b/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch @@ -75,7 +75,7 @@ Signed-off-by: Ansuel Smith ################################################################################## --- /dev/null +++ b/drivers/cpufreq/qcom-cpufreq-krait.c -@@ -0,0 +1,603 @@ +@@ -0,0 +1,609 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -435,6 +435,11 @@ Signed-off-by: Ansuel Smith + return 0; +} + ++static struct freq_attr *krait_cpufreq_attr[] = { ++ &cpufreq_freq_attr_scaling_available_freqs, ++ NULL, ++}; ++ +static struct cpufreq_driver krait_cpufreq_driver = { + .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK | + CPUFREQ_IS_COOLING_DEV, @@ -446,6 +451,7 @@ Signed-off-by: Ansuel Smith + .online = cpufreq_online, + .offline = cpufreq_offline, + .name = "krait-cpufreq", ++ .attr = krait_cpufreq_attr, + .suspend = cpufreq_generic_suspend, +}; +