From: Felix Fietkau Date: Fri, 26 Jan 2024 12:13:56 +0000 (+0100) Subject: mac80211: fix typo in getting path from board.json X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e617fa33b574528f5af6983a655d6df054d0345c;p=openwrt%2Fstaging%2Fsvanheule.git mac80211: fix typo in getting path from board.json Use json_get_vars in order to avoid getting bogus values when extra properties are present Signed-off-by: Felix Fietkau --- diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index ed52822568..49ffb219bc 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -559,7 +559,7 @@ get_board_phy_name() ( local ref_path="$3" json_select "$key" - json_get_values path + json_get_vars path json_select .. [ "${ref_path%+*}" = "$path" ] && fallback_phy=$key @@ -591,7 +591,7 @@ rename_board_phy_by_name() ( json_load_file /etc/board.json json_select wlan json_select "${phy%.*}" || return 0 - json_get_values path + json_get_vars path prev_phy="$(iwinfo nl80211 phyname "path=$path${suffix:++$suffix}")" [ -n "$prev_phy" ] || return 0