diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-10-09 16:41:28 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-10-09 16:41:28 +0000 |
| commit | 7eb7af77cb358149420d7b3046deb9ea65f10778 (patch) | |
| tree | fcedf8bec7fb4ed8c43340b38074339316d6849c /package/hostapd | |
| parent | c43d07561e8fcaf08b7984e0f6b4d312b8d586ff (diff) | |
| download | upstream-7eb7af77cb358149420d7b3046deb9ea65f10778.tar.gz upstream-7eb7af77cb358149420d7b3046deb9ea65f10778.tar.bz2 upstream-7eb7af77cb358149420d7b3046deb9ea65f10778.zip | |
[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
Diffstat (limited to 'package/hostapd')
| -rw-r--r-- | package/hostapd/files/wpa_supplicant.sh | 5 |
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 } |