aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Shvedov <yshvedov@wimarksystems.com>2017-10-19 17:29:28 +0300
committerJohn Crispin <john@phrozen.org>2017-11-06 16:39:41 +0100
commit09f90b7829c5168f49a7053cbc1e6c8b32a75888 (patch)
tree47232fa4e8af402c36725c2f2b2f55413960786e
parentee791fa4ab66bb77fec0f2e323fe4c8637808a5b (diff)
downloadupstream-09f90b7829c5168f49a7053cbc1e6c8b32a75888.tar.gz
upstream-09f90b7829c5168f49a7053cbc1e6c8b32a75888.tar.bz2
upstream-09f90b7829c5168f49a7053cbc1e6c8b32a75888.zip
hostapd: remove default r1_key_holder generation
By default, hostapd assumes r1_key_holder equal to bssid. If LEDE configures the same static r1 key holder ID on two different APs (BSSes) the RRB exchanges fails behind them. Signed-off-by: Yury Shvedov <yshvedov@wimarksystems.com>
-rw-r--r--package/network/services/hostapd/files/hostapd.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 144e49b120..e48a54fc84 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -397,7 +397,6 @@ hostapd_set_bss_options() {
set_default mobility_domain "4f57"
set_default r0_key_lifetime 10000
- set_default r1_key_holder "00004f577274"
set_default reassociation_deadline 1000
set_default pmk_r1_push 0
set_default ft_psk_generate_local 0
@@ -405,7 +404,7 @@ hostapd_set_bss_options() {
append bss_conf "mobility_domain=$mobility_domain" "$N"
append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
- append bss_conf "r1_key_holder=$r1_key_holder" "$N"
+ [ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
append bss_conf "reassociation_deadline=$reassociation_deadline" "$N"
append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"