Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mac80211: always call wireless_set_data (FS#3784)

Browse Source 
When wifi is turned off, drv_mac80211_teardown sometimes fails (silently)
because the device to be torn down is not defined.

This situation arises if drv_mac80211_setup was called twice when
wifi was turned on.

This commit ensures that the device to be torn down is always defined
in drv_mac80211_teardown.

Steps to reproduce:

1) Use /sbin/wifi to turn on wifi.
   uci set wireless.@wifi-iface[0].disabled=0
   uci set wireless.@wifi-device[0].disabled=0
   uci commit
   wifi

2) Use /sbin/wifi to turn off wifi.
   uci set wireless.@wifi-device[0].disabled=1
   uci commit
   wifi

3) Observe that wifi is still up.

branches affected: trunk, 21.02

Signed-off-by: Bob Cantor <coxede6557@w3boats.com>
(cherry-picked from commit d515f6b6cde357bf480d32a7387f07ea40e85e52)
This commit is contained in:
Bob Cantor 2021-06-25 04:07:34 +10:00 committed by Felix Fietkau
parent bea9380149
commit 9302e63d1a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@ -907,10 +907,8 @@ drv_mac80211_setup() {
return 1 return 1
} }
[ -z "$(uci -q -P /var/state show wireless._${phy})" ] && { wireless_set_data phy="$phy"
uci -q -P /var/state set wireless._${phy}=phy [ -z "$(uci -q -P /var/state show wireless._${phy})" ] && uci -q -P /var/state set wireless._${phy}=phy
wireless_set_data phy="$phy"
}
OLDAPLIST=$(uci -q -P /var/state get wireless._${phy}.aplist) OLDAPLIST=$(uci -q -P /var/state get wireless._${phy}.aplist)
OLDSPLIST=$(uci -q -P /var/state get wireless._${phy}.splist) OLDSPLIST=$(uci -q -P /var/state get wireless._${phy}.splist)