[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 87f7d29..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 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" ] && {
        [ -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}
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 ${country:+country_code=$country}

+${noscan:+noscan=$noscan}

 $base_cfg
 
 EOF
 $base_cfg
 
 EOF


@@ -351,12 +353,11 @@ enable_mac80211() {
                ifconfig "$ifname" up
 
                if [ ! "$mode" = "ap" ]; then
                ifconfig "$ifname" up
 
                if [ ! "$mode" = "ap" ]; then

-                       mac80211_start_vif "$vif" "$ifname"
-
+                       ifconfig "$ifname" up

                        case "$mode" in
                                adhoc)
                                        config_get bssid "$vif" bssid
                        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)
                                        iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
                                ;;
                                sta)


@@ -370,6 +371,7 @@ enable_mac80211() {
                                        fi
                                ;;
                        esac
                                        fi
                                ;;
                        esac

+                       mac80211_start_vif "$vif" "$ifname"

                fi
        done
 
                fi
        done