From 5d11e4a29aaf23c6f473e6b0f9d60479255059e1 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 9 Oct 2012 16:41:28 +0000 Subject: [PATCH] [package] hostapd: ensure that wpa_supplicant_setup_vif() returns success in cases where wpa_supplicant is not invoked (#11996) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33674 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/hostapd/files/wpa_supplicant.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh index 5c4bd93d0..928243e42 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 }