[package] uhttpd:

[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index f127b28..5991b4c 100644 (file)
--- 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
@@ -329,20 +331,20 @@ enable_mac80211() {
                start_hostapd=1
        done
 
-       [ -n "$start_hostapd" ] || return 0
+       [ -n "$start_hostapd" ] && {
+               hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
+                       echo "Failed to start hostapd for $phy"
+                       return
+               }
+               sleep 2
 
-       hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
-               echo "Failed to start hostapd for $phy"
-               return
+               for vif in $vifs; do
+                       config_get mode "$vif" mode
+                       config_get ifname "$vif" ifname
+                       [ "$mode" = "ap" ] || continue
+                       mac80211_start_vif "$vif" "$ifname"
+               done
        }
-       sleep 2
-
-       for vif in $vifs; do
-               config_get mode "$vif" mode
-               config_get ifname "$vif" ifname
-               [ "$mode" = "ap" ] || continue
-               mac80211_start_vif "$vif" "$ifname"
-       done
 
        for vif in $vifs; do
                config_get mode "$vif" mode
@@ -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