aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Kemper <sebastian_ml@gmx.net>2019-11-23 11:25:02 +0100
committerDaniel Golle <daniel@makrotopia.org>2019-11-23 11:28:27 +0100
commit28d84331f4bba5923059e701f5d4878b2df3fa79 (patch)
tree76cdc9da1abf524358be4aefe0c838cb13cab335
parentf1ca27740595105ec7b3d7ffc4b046c038916082 (diff)
downloadupstream-28d84331f4bba5923059e701f5d4878b2df3fa79.tar.gz
upstream-28d84331f4bba5923059e701f5d4878b2df3fa79.tar.bz2
upstream-28d84331f4bba5923059e701f5d4878b2df3fa79.zip
mac80211: add default value for noscan
Commit b3d8b3a introduced a new test: [ -n "$noscan" -a "$noscan" -gt 0 ] && hostapd_noscan=1 But if length of "$noscan" is zero (noscan is not set) this doesn't stop the shell to evaluate the rest of the test. root@hank2:~# [ -n "$noscan" -a "$noscan" -gt 0 ] ash: out of range root@hank2:~# So when radios are brought up this shows in the log: Sat Nov 23 10:51:38 2019 daemon.info procd: - init complete - Sat Nov 23 10:52:24 2019 daemon.notice netifd: radio1 (1243): sh: out of range Sat Nov 23 10:52:25 2019 user.notice firewall: Reloading firewall due to ifup of wan (eth0.2) Sat Nov 23 10:52:25 2019 daemon.notice netifd: radio0 (1242): sh: out of range Sat Nov 23 10:52:26 2019 authpriv.info dropbear[1536]: Not backgrounding This commit sets noscan to 0 if unset and removes the gratuitous length check, preventing the warning. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
-rw-r--r--package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index a04f1e3ca7..5c67ea0600 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -106,7 +106,9 @@ mac80211_hostapd_setup_base() {
json_get_vars noscan ht_coex
json_get_values ht_capab_list ht_capab tx_burst
- [ -n "$noscan" -a "$noscan" -gt 0 ] && hostapd_noscan=1
+ set_default noscan 0
+
+ [ "$noscan" -gt 0 ] && hostapd_noscan=1
[ "$tx_burst" = 0 ] && tx_burst=
ieee80211n=1