Iotthd 3963 2 (ARMmbed#2301)

* WS bootstrap: Use UC fixed channel in discovery, configured in EAPOL

* Single function for ws fhss configure

Author: Jarkko Paso

source/6LoWPAN/ws/ws_bootstrap.c

@@ -506,7 +506,7 @@ static uint16_t ws_randomize_fixed_channel(uint16_t configured_fixed_channel, ui
     }
 }
 
-static int8_t ws_fhss_discovery_configure(protocol_interface_info_entry_t *cur)
+static int8_t ws_fhss_configure(protocol_interface_info_entry_t *cur, bool discovery)
 {
     // Read configuration of existing FHSS and start using the default values for any network
     fhss_ws_configuration_t fhss_configuration;
@@ -515,8 +515,12 @@ static int8_t ws_fhss_discovery_configure(protocol_interface_info_entry_t *cur)
     if (ns_fhss_ws_configuration_get(cur->ws_info->fhss_api)) {
         memcpy(&fhss_configuration, ns_fhss_ws_configuration_get(cur->ws_info->fhss_api), sizeof(fhss_ws_configuration_t));
     }
-
-    fhss_configuration.ws_uc_channel_function = (fhss_ws_channel_functions)cur->ws_info->fhss_uc_channel_function;
+    // Discovery is done using fixed channel
+    if (discovery) {
+        fhss_configuration.ws_uc_channel_function = WS_FIXED_CHANNEL;
+    } else {
+        fhss_configuration.ws_uc_channel_function = (fhss_ws_channel_functions)cur->ws_info->fhss_uc_channel_function;
+    }
     fhss_configuration.ws_bc_channel_function = WS_FIXED_CHANNEL;
     fhss_configuration.fhss_broadcast_interval = 0;
     uint8_t tmp_uc_fixed_channel = ws_randomize_fixed_channel(cur->ws_info->fhss_uc_fixed_channel, cur->ws_info->hopping_schdule.number_of_channels);
@@ -2280,7 +2284,7 @@ static void ws_bootstrap_network_discovery_configure(protocol_interface_info_ent
     cur->ws_info->network_pan_id = 0xffff;
 
     ws_common_regulatory_domain_config(cur);
-    ws_fhss_discovery_configure(cur);
+    ws_fhss_configure(cur, true);
 
     //Set Network names, Pan information configure, hopping schedule & GTKHash
     ws_llc_set_network_name(cur, (uint8_t *)cur->ws_info->network_name, strlen(cur->ws_info->network_name));
@@ -2937,7 +2941,7 @@ void ws_bootstrap_state_machine(protocol_interface_info_entry_t *cur)
             cur->ws_info->trickle_pc_running = false;
             cur->ws_info->trickle_pas_running = false;
             cur->ws_info->trickle_pcs_running = false;
-
+            ws_fhss_configure(cur, false);
             ws_bootstrap_start_authentication(cur);
             break;
         case ER_RPL_SCAN: