X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fnetwork%2Fservices%2Fhostapd%2Ffiles%2Fnetifd.sh;fp=package%2Fnetwork%2Fservices%2Fhostapd%2Ffiles%2Fnetifd.sh;h=a3ffd9395475c91f764e532379ab9a741c55e7b7;hp=23d2e7e83ebe5ca744f40e300fdbfb1014c555c5;hb=7586ad840f957bb798829292e33c7a46814c7cbf;hpb=de97cff7af8296c667fdf5736c52574f2c9a1a5e diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 23d2e7e83e..a3ffd93954 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -538,7 +538,9 @@ wpa_supplicant_add_network() { json_get_vars \ ssid bssid key \ basic_rate mcast_rate \ - ieee80211w + ieee80211w ieee80211r + + set_default ieee80211r 0 local key_mgmt='NONE' local enc_str= @@ -549,6 +551,8 @@ wpa_supplicant_add_network() { local scan_ssid="scan_ssid=1" local freq + [ "$ieee80211r" -gt 0 ] && wpa_key_mgmt="FT-PSK $wpa_key_mgmt" + [[ "$_w_mode" = "adhoc" ]] && { append network_data "mode=1" "$N$T" [ -n "$channel" ] && { @@ -594,6 +598,7 @@ wpa_supplicant_add_network() { ;; eap) key_mgmt='WPA-EAP' + [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt" json_get_vars eap_type identity ca_cert [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"