aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-03-27 13:38:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-03-27 13:38:08 +0000
commitd5833ff3f3a748769595bb2624c32afaeb88a5ba (patch)
treeb42cb0e8b9f5cf717101cb2535d0d19826794f6e /package
parentd654ad2ae9a17471325ad49bd9b5c1c9ca8eafdc (diff)
downloadupstream-d5833ff3f3a748769595bb2624c32afaeb88a5ba.tar.gz
upstream-d5833ff3f3a748769595bb2624c32afaeb88a5ba.tar.bz2
upstream-d5833ff3f3a748769595bb2624c32afaeb88a5ba.zip
wpa_supplicant: fix regressions introduced by the ibss-rsn changes
SVN-Revision: 31087
Diffstat (limited to 'package')
-rw-r--r--package/hostapd/files/wpa_supplicant.sh7
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