hostapd: remove default r1_key_holder generation
authorYury Shvedov <yshvedov@wimarksystems.com>
Thu, 19 Oct 2017 14:29:28 +0000 (17:29 +0300)
committerJohn Crispin <john@phrozen.org>
Mon, 6 Nov 2017 15:39:41 +0000 (16:39 +0100)
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>
package/network/services/hostapd/files/hostapd.sh

index 144e49b..e48a54f 100644 (file)
@@ -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"