diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2018-05-12 21:08:18 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2018-05-14 09:48:58 +0200 |
| commit | 6e0fa4a76db667d7f0c1d84a3af5017df26d3fad (patch) | |
| tree | 8f0767bc33a3dfd200cbdf64667015e138ed352c /package/network/services/hostapd/files | |
| parent | 6aaeec666d0af4240b1d61f5654d91a53cf35a82 (diff) | |
| download | upstream-6e0fa4a76db667d7f0c1d84a3af5017df26d3fad.tar.gz upstream-6e0fa4a76db667d7f0c1d84a3af5017df26d3fad.tar.bz2 upstream-6e0fa4a76db667d7f0c1d84a3af5017df26d3fad.zip | |
hostapd: fix mesh+AP
Fix encrypted (or DFS) AP+MESH interface combination in a way similar
to how it's done for AP+STA and fix netifd shell script.
Refresh patches while at it.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/network/services/hostapd/files')
| -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 5065978f3c..520da5b159 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -674,7 +674,7 @@ wpa_supplicant_add_network() { [[ "$_w_mode" = "adhoc" ]] && { append network_data "mode=1" "$N$T" - [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" + [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" scan_ssid="scan_ssid=0" @@ -683,11 +683,11 @@ wpa_supplicant_add_network() { [[ "$_w_mode" = "mesh" ]] && { json_get_vars mesh_id mesh_fwding - ssid="${mesh_id}" + [ -n "$mesh_id" ] && ssid="${mesh_id}" append network_data "mode=5" "$N$T" [ -n "$mesh_fwding" ] && append network_data "mesh_fwding=${mesh_fwding}" "$N$T" - [ -n "$channel" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" + [ -n "$freq" ] && wpa_supplicant_set_fixed_freq "$freq" "$htmode" [ "$noscan" = "1" ] && append network_data "noscan=1" "$N$T" append wpa_key_mgmt "SAE" scan_ssid="" |