Fixed ASYNCH message send for fixed channel setup.

Change-Id: Ib175898ce2fb9f31a5c9bd3f94249cdb5791012a

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2393,6 +2393,19 @@ void ws_bootstrap_configuration_trickle_reset(protocol_interface_info_entry_t *c
     trickle_inconsistent_heard(&cur->ws_info->trickle_pan_config, &cur->ws_info->trickle_params_pan_discovery);
 }
 
+static void ws_set_asynch_channel_list(protocol_interface_info_entry_t *cur, asynch_request_t *async_req)
+{
+    memset(&async_req->channel_list, 0, sizeof(channel_list_s));
+    if (cur->ws_info->fhss_uc_channel_function == WS_FIXED_CHANNEL) {
+        //SET 1 Channel only
+        uint16_t channel_number = cur->ws_info->fhss_uc_fixed_channel;
+        async_req->channel_list.channel_mask[0 + (channel_number / 32)] = (1 << (channel_number % 32));
+    } else {
+        ws_generate_channel_list(async_req->channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
+    }
+
+    async_req->channel_list.channel_page = CHANNEL_PAGE_10;
+}
 
 static void ws_bootstrap_pan_advert_solicit(protocol_interface_info_entry_t *cur)
 {
@@ -2404,9 +2417,9 @@ static void ws_bootstrap_pan_advert_solicit(protocol_interface_info_entry_t *cur
     async_req.wp_requested_nested_ie_list.us_ie = true;
     async_req.wp_requested_nested_ie_list.net_name_ie = true;
 
-    ws_generate_channel_list(async_req.channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
+    ws_set_asynch_channel_list(cur, &async_req);
+
 
-    async_req.channel_list.channel_page = CHANNEL_PAGE_10;
     async_req.security.SecurityLevel = 0;
 
     ws_llc_asynch_request(cur, &async_req);
@@ -2422,9 +2435,7 @@ static void ws_bootstrap_pan_config_solicit(protocol_interface_info_entry_t *cur
     async_req.wp_requested_nested_ie_list.us_ie = true;
     async_req.wp_requested_nested_ie_list.net_name_ie = true;
 
-    ws_generate_channel_list(async_req.channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
-
-    async_req.channel_list.channel_page = CHANNEL_PAGE_10;
+    ws_set_asynch_channel_list(cur, &async_req);
     async_req.security.SecurityLevel = 0;
 
     ws_llc_asynch_request(cur, &async_req);
@@ -2501,9 +2512,7 @@ static void ws_bootstrap_pan_advert(protocol_interface_info_entry_t *cur)
     async_req.wp_requested_nested_ie_list.pan_ie = true;
     async_req.wp_requested_nested_ie_list.net_name_ie = true;
 
-    ws_generate_channel_list(async_req.channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
-
-    async_req.channel_list.channel_page = CHANNEL_PAGE_10;
+    ws_set_asynch_channel_list(cur, &async_req);
     async_req.security.SecurityLevel = 0;
 
     if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
@@ -2534,9 +2543,8 @@ static void ws_bootstrap_pan_config(protocol_interface_info_entry_t *cur)
     async_req.wp_requested_nested_ie_list.gtkhash_ie = true;
     async_req.wp_requested_nested_ie_list.vp_ie = true;
 
-    ws_generate_channel_list(async_req.channel_list.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
+    ws_set_asynch_channel_list(cur, &async_req);
 
-    async_req.channel_list.channel_page = CHANNEL_PAGE_10;
     async_req.security.SecurityLevel = mac_helper_default_security_level_get(cur);
     async_req.security.KeyIdMode = mac_helper_default_security_key_id_mode_get(cur);
     async_req.security.KeyIndex = mac_helper_default_key_index_get(cur);