aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-11 10:52:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-11 10:52:01 +0000
commite8a45bfc155e5c081fc3fa732e12ddba9d7360d1 (patch)
treea40834ba7435d2295de7ee011ef56765cf9b5950
parentdaaed6f251c7714cdf7aec6dc2940a605e82eaed (diff)
downloadupstream-e8a45bfc155e5c081fc3fa732e12ddba9d7360d1.tar.gz
upstream-e8a45bfc155e5c081fc3fa732e12ddba9d7360d1.tar.bz2
upstream-e8a45bfc155e5c081fc3fa732e12ddba9d7360d1.zip
netifd: fix ieee80211r 'sh: bad number' in mac80211 setup (bug #19345)
Two errors "netifd: radio0: sh: bad number" have recently surfaced in system log in trunk when wifi interfaces come up. I tracked the errors to checking numerical values of some config options without ensuring that the option has any value. The errors I see have apparently been introduced by r45051 (ieee80211r in hostapd) and r45326 (start_disabled in mac80211). My patches fix two instances of "bad number", but there may be a third one, as the original report in bug 19345 pre-dates r45326 and already has two "bad number" errors for radio0. https://dev.openwrt.org/ticket/19345 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> SVN-Revision: 45380
-rw-r--r--package/network/services/hostapd/files/netifd.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 6e4b23b73e..53743a14f1 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -346,6 +346,7 @@ hostapd_set_bss_options() {
if [ "$wpa" -ge "1" ]; then
json_get_vars nasid ieee80211r
+ set_default ieee80211r 0
[ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N"
if [ "$ieee80211r" -gt "0" ]; then