X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8b0591cf4bb22e9c614565c17706b8bb5ab0a8c5..cbe586a91926490315c183de105cba6ee4872d1e:/package/mac80211/files/lib/wifi/mac80211.sh?ds=sidebyside

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 87f7d29da..5991b4c16 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -10,6 +10,7 @@ mac80211_hostapd_setup_base() {
 	config_get country "$device" country
 	config_get hwmode "$device" hwmode
 	config_get channel "$device" channel
+	config_get_bool noscan "$device" noscan
 	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
 	[ "$channel" = auto ] && channel=
 	[ -n "$hwmode" ] && {
@@ -71,6 +72,7 @@ tx_queue_data0_burst=1.5
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 ${country:+country_code=$country}
+${noscan:+noscan=$noscan}
 $base_cfg
 
 EOF
@@ -351,12 +353,11 @@ enable_mac80211() {
 		ifconfig "$ifname" up
 
 		if [ ! "$mode" = "ap" ]; then
-			mac80211_start_vif "$vif" "$ifname"
-
+			ifconfig "$ifname" up
 			case "$mode" in
 				adhoc)
 					config_get bssid "$vif" bssid
-					config_get bssid "$vif" ssid
+					config_get ssid "$vif" ssid
 					iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
 				;;
 				sta)
@@ -370,6 +371,7 @@ enable_mac80211() {
 					fi
 				;;
 			esac
+			mac80211_start_vif "$vif" "$ifname"
 		fi
 	done