From 95f01d342b263c32bba9ff78ac4d6e284d1f4f6c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 17 Feb 2024 17:58:50 +0100 Subject: [PATCH] wifi-scripts: Support HE Iftypes with multiple entries With mac80211_hwsim I have seen such entries in OpenWrt 22.03: HE Iftypes: managed, AP The mac80211.sh script did not detect the entry and failed. Allow arbitrary other entries before to fix this problem. Signed-off-by: Hauke Mehrtens (cherry picked from commit 5df7a78e821cbdcc3beb80150798712a4c00b00e) --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 6ff627b038..6a37cbb22e 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -428,9 +428,9 @@ mac80211_hostapd_setup_base() { he_bss_color:128 \ he_bss_color_enabled: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=$(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 | sed -n '/HE Iftypes: AP/,$p' | 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" -- 2.25.1