diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:34:24 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-26 23:34:24 +0000 |
commit | 8683f4c75523d94df8aa2a456f33df3389b61602 (patch) | |
tree | 02b04aeb62e6f188e7363edf1b45cc58fce2c3b0 /package/network/services/hostapd/files/netifd.sh | |
parent | 5ebd9314c0a31bd5896d1b7b9a0a2f48a7f9e9d6 (diff) | |
download | master-187ad058-8683f4c75523d94df8aa2a456f33df3389b61602.tar.gz master-187ad058-8683f4c75523d94df8aa2a456f33df3389b61602.tar.bz2 master-187ad058-8683f4c75523d94df8aa2a456f33df3389b61602.zip |
hostapd: allow multiple key management algorithms
To enable 802.11r, wpa_key_mgmt should contain FT-EAP or FT-PSK. Allow
multiple key management algorithms to make this possible.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45050 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd/files/netifd.sh')
-rw-r--r-- | package/network/services/hostapd/files/netifd.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 26a255feb2..a5abdce1ce 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -169,7 +169,7 @@ hostapd_set_bss_options() { wireless_vif_parse_encryption local bss_conf - local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey + local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt json_get_vars \ wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \ @@ -233,6 +233,7 @@ hostapd_set_bss_options() { append bss_conf "wpa_psk_file=$wpa_psk_file" "$N" } wps_possible=1 + append wpa_key_mgmt "WPA-PSK" ;; eap) json_get_vars \ @@ -276,7 +277,7 @@ hostapd_set_bss_options() { [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N" append bss_conf "eapol_key_index_workaround=1" "$N" append bss_conf "ieee8021x=1" "$N" - append bss_conf "wpa_key_mgmt=WPA-EAP" "$N" + append wpa_key_mgmt "WPA-EAP" [ -n "$dynamic_vlan" ] && { append bss_conf "dynamic_vlan=$dynamic_vlan" "$N" @@ -341,6 +342,7 @@ hostapd_set_bss_options() { if [ "$wpa" -ge "1" ]; then json_get_vars nasid [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N" + [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N" fi if [ "$wpa" -ge "2" ]; then |