ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 21:58:04 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

wifi-scripts: fix regression with ucode update

Browse Source 
nl80211.request with GET_WIPHY for a single wiphy no longer returns an array

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-12-08 13:36:41 +01:00
parent 22d2aa65e8
commit 0286dfe394
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/hostapd.uc
View File

@ -438,29 +438,25 @@ function device_extended_features(data, flag) {
function device_capabilities(phy) { function device_capabilities(phy) {
let idx = +substr(phy, 3, 1);; let idx = +substr(phy, 3, 1);;
let phys = nl80211.request(nl80211.const.NL80211_CMD_GET_WIPHY, nl80211.const.NLM_F_DUMP, { wiphy: idx, split_wiphy_dump: true }); phy = nl80211.request(nl80211.const.NL80211_CMD_GET_WIPHY, nl80211.const.NLM_F_DUMP, { wiphy: idx, split_wiphy_dump: true });
if (!phy)
for (let phy in phys) { return;
if (!phy || phy.wiphy != idx) for (let band in phy.wiphy_bands) {
if (!band)
continue; continue;
for (let band in phy.wiphy_bands) { phy_capabilities.ht_capa = band.ht_capa ?? 0;
if (!band) phy_capabilities.vht_capa = band.vht_capa ?? 0;
for (let iftype in band.iftype_data) {
if (!iftype.iftypes.ap)
continue; continue;
phy_capabilities.ht_capa = band.ht_capa ?? 0; phy_capabilities.he_mac_cap = iftype.he_cap_mac;
phy_capabilities.vht_capa = band.vht_capa ?? 0; phy_capabilities.he_phy_cap = iftype.he_cap_phy;
for (let iftype in band.iftype_data) {
if (!iftype.iftypes.ap)
continue;
phy_capabilities.he_mac_cap = iftype.he_cap_mac;
phy_capabilities.he_phy_cap = iftype.he_cap_phy;
}
break;
} }
phy_features.ftm_responder = device_extended_features(phy.extended_features, NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);
phy_features.radar_background = device_extended_features(phy.extended_features, NL80211_EXT_FEATURE_RADAR_BACKGROUND);
break; break;
} }
phy_features.ftm_responder = device_extended_features(phy.extended_features, NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);
phy_features.radar_background = device_extended_features(phy.extended_features, NL80211_EXT_FEATURE_RADAR_BACKGROUND);
} }
function generate(config) { function generate(config) {