diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-04-06 23:58:40 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-04-14 00:22:21 +0100 |
| commit | f37d6342367b4f8393f9693edd96b12dfa016399 (patch) | |
| tree | 39814f5b920a29263d3d25bd9991a4e906297b8b /package/network/services/hostapd/files/hostapd.sh | |
| parent | 35f208da3c13cc16227f229f8aea14c4f0a06928 (diff) | |
| download | upstream-f37d6342367b4f8393f9693edd96b12dfa016399.tar.gz upstream-f37d6342367b4f8393f9693edd96b12dfa016399.tar.bz2 upstream-f37d6342367b4f8393f9693edd96b12dfa016399.zip | |
hostapd: reduce to a single instance per service
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services/hostapd/files/hostapd.sh')
| -rw-r--r-- | package/network/services/hostapd/files/hostapd.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 542056fe9a..637f298ad9 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -1075,8 +1075,8 @@ wpa_supplicant_run() { _wpa_supplicant_common "$ifname" - ubus wait_for wpa_supplicant.$phy - ubus call wpa_supplicant.$phy config_add "{ \ + ubus wait_for wpa_supplicant + ubus call wpa_supplicant config_add "{ \ \"driver\": \"${_w_driver:-wext}\", \"ctrl\": \"$_rpath\", \ \"iface\": \"$ifname\", \"config\": \"$_config\" \ ${network_bridge:+, \"bridge\": \"$network_bridge\"} \ @@ -1087,7 +1087,7 @@ wpa_supplicant_run() { [ "$ret" != 0 ] && wireless_setup_vif_failed WPA_SUPPLICANT_FAILED - local supplicant_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['supplicant-${phy}'].pid") + local supplicant_pid=$(ubus call service list '{"name": "hostapd"}' | jsonfilter -l 1 -e "@['hostapd'].instances['supplicant'].pid") wireless_add_process "$supplicant_pid" "/usr/sbin/wpa_supplicant" 1 return $ret |