diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-27 13:38:08 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-27 13:38:08 +0000 |
| commit | 6f5aac5856eafca6766fe098aeeeca4419661fd5 (patch) | |
| tree | 8b76e837022e1b5a1551bb70075809e8c86e040e | |
| parent | 4e6d1ddc42a32d12531b9f7fb06f8bf953072cd5 (diff) | |
wpa_supplicant: fix regressions introduced by the ibss-rsn changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31087 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/hostapd/files/wpa_supplicant.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh index 84f6eaa95e..bbd928bfec 100644 --- 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 |