WS bootstrap: Moved calculating and setting FHSS hop to own function

Author: Jarkko Paso

source/6LoWPAN/ws/ws_bootstrap.c

@@ -973,6 +973,19 @@ static void ws_bootstrap_ip_stack_activate(protocol_interface_info_entry_t *cur)
     ws_bootstrap_ip_stack_reset(cur);
 }
 
+static void ws_set_fhss_hop(protocol_interface_info_entry_t *cur)
+{
+    uint16_t own_rank = ws_bootstrap_route_cost_calculate(cur);
+    uint16_t rank_inc = ws_bootstrap_get_min_rank_inc(cur);
+    if (own_rank == 0xffff || rank_inc == 0xffff) {
+        return;
+    }
+    // Calculate own hop count. This method gets inaccurate when hop count increases.
+    uint8_t own_hop = (own_rank - rank_inc) / rank_inc;
+    ns_fhss_ws_set_hop_count(cur->ws_info->fhss_api, own_hop);
+}
+
+
 static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
 {
 
@@ -984,14 +997,7 @@ static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
     if (event == RPL_EVENT_DAO_DONE) {
         // Trigger statemachine check
         cur->bootsrap_state_machine_cnt = 1;
-        uint16_t own_rank = ws_bootstrap_route_cost_calculate(cur);
-        uint16_t rank_inc = ws_bootstrap_get_min_rank_inc(cur);
-        if (own_rank == 0xffff || rank_inc == 0xffff) {
-            return;
-        }
-        // Calculate own hop count. This method gets inaccurate when hop count increases.
-        uint8_t own_hop = (own_rank - rank_inc) / rank_inc;
-        ns_fhss_ws_set_hop_count(cur->ws_info->fhss_api, own_hop);
+        ws_set_fhss_hop(cur);
 
     } else if(event == RPL_EVENT_LOCAL_REPAIR_NO_MORE_DIS) {
         /*