aboutsummaryrefslogtreecommitdiffstats
path: root/package/hostapd
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-10-09 16:41:28 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-10-09 16:41:28 +0000
commitff1b1635401fab42d6b1df1992f95bcb779c8bfb (patch)
tree359061d63231ce8be148377ee155b073e1c586c8 /package/hostapd
parentf14b8d43f2a0320e40cff8a131cebbf01688b2bc (diff)
downloadupstream-ff1b1635401fab42d6b1df1992f95bcb779c8bfb.tar.gz
upstream-ff1b1635401fab42d6b1df1992f95bcb779c8bfb.tar.bz2
upstream-ff1b1635401fab42d6b1df1992f95bcb779c8bfb.zip
hostapd: ensure that wpa_supplicant_setup_vif() returns success in cases where wpa_supplicant is not invoked (#11996)
SVN-Revision: 33674
Diffstat (limited to 'package/hostapd')
-rw-r--r--package/hostapd/files/wpa_supplicant.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 5c4bd93d02..928243e425 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -191,6 +191,9 @@ network={
$wep_tx_keyidx
}
EOF
- [ -z "$proto" -a "$key_mgmt" != "NONE" ] || \
+ if [ -n "$proto" -o "$key_mgmt" == "NONE" ]; then
wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
+ else
+ return 0
+ fi
}