mac80211: fix use of local variable
authorLeon M. George <leon@georgemail.eu>
Thu, 30 Apr 2020 08:26:36 +0000 (10:26 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 30 Jun 2020 20:13:23 +0000 (22:13 +0200)
mac80211_get_addr is called from mac80211_generate_mac, where the local variable
initialisation id="${macidx:-0}" suggests that macidx is not always defined.
Probably, idx was supposed to be used instead of $(($macidx + 1)).

Fixes: 4d99db168cf7 ("mac80211: try to get interface addresses from wiphy sysfs 'addresses' if no mask is set")
Signed-off-by: Leon M. George <leon@georgemail.eu>
(cherry picked from commit 8f95220bcb554b1b668114e5264ebce4028c5f93)

package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh

index 634aadcee949bd1c3ad9963d01d9eb444250aa0b..36aebbb2ccfec2137d5d260fe2111d77f531ddec 100644 (file)
@@ -352,7 +352,7 @@ mac80211_get_addr() {
        local phy="$1"
        local idx="$(($2 + 1))"
 
-       head -n $(($macidx + 1)) /sys/class/ieee80211/${phy}/addresses | tail -n1
+       head -n $idx /sys/class/ieee80211/${phy}/addresses | tail -n1
 }
 
 mac80211_generate_mac() {