wpa_supplicant: fix regressions introduced by the ibss-rsn changes

[openwrt/svn-archive/archive.git] / package / hostapd / files / wpa_supplicant.sh

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 84f6eaa95e9da5130f033c4171459b214f5ce55c..bbd928bfeca66e531dee2ded1caeaea353132bba 100644 (file)
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -3,7 +3,7 @@ wpa_supplicant_setup_vif() {
        local driver="$2"
        local key="$key"
        local options="$3"
-       local freq
+       local freq=""
        [ -n "$4" ] && freq="frequency=$4"
 
        # wpa_supplicant should use wext for mac80211 cards
@@ -25,7 +25,7 @@ wpa_supplicant_setup_vif() {
                config_set "$vif" bridge "$bridge"
        }
 
-       local mode ifname wds
+       local mode ifname wds modestr=""
        config_get mode "$vif" mode
        config_get ifname "$vif" ifname
        config_get_bool wds "$vif" wds 0
@@ -33,6 +33,7 @@ wpa_supplicant_setup_vif() {
                echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
                return 1
        }
+       [ "$mode" = "adhoc" ] && modestr="mode=1"
 
        case "$enc" in
                *none*)
@@ -126,7 +127,7 @@ wpa_supplicant_setup_vif() {
        cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 ctrl_interface=/var/run/wpa_supplicant-$ifname
 network={
-       $mode
+       $modestr
        scan_ssid=1
        ssid="$ssid"
        $bssid