Fixed Ifdown / UP sequence and and discovery state set own hop to 0xff.

Change-Id: I42c1e9db1f404c3e41bbcdacf1998045ea5756ff

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -421,7 +421,7 @@ static int8_t ws_fhss_initialize(protocol_interface_info_entry_t *cur)
 {
     fhss_api_t *fhss_api = ns_sw_mac_get_fhss_api(cur->mac_api);
 
-    if (!fhss_api) {
+    if (!fhss_api || (fhss_api && cur->ws_info->fhss_owner)) {
         // When FHSS doesn't exist yet, create one
         fhss_ws_configuration_t fhss_configuration;
         memset(&fhss_configuration, 0, sizeof(fhss_ws_configuration_t));
@@ -438,12 +438,25 @@ static int8_t ws_fhss_initialize(protocol_interface_info_entry_t *cur)
         fhss_configuration.fhss_bc_dwell_interval = cur->ws_info->fhss_bc_dwell_interval;
         fhss_configuration.fhss_broadcast_interval = cur->ws_info->fhss_bc_interval;
 
-        fhss_api = ns_fhss_ws_create(&fhss_configuration, cur->ws_info->fhss_timer_ptr);
         if (!fhss_api) {
-            tr_error("fhss create failed");
-            return -1;
+            fhss_api = ns_fhss_ws_create(&fhss_configuration, cur->ws_info->fhss_timer_ptr);
+            if (!fhss_api) {
+                tr_error("fhss create failed");
+                return -1;
+            }
+            ns_sw_mac_fhss_register(cur->mac_api, fhss_api);
+            cur->ws_info->fhss_owner = true;
+        } else {
+            //Configuration set
+            ns_fhss_ws_configuration_set(cur->ws_info->fhss_api, &fhss_configuration);
+
+            if (cur->bootsrap_mode == ARM_NWK_BOOTSRAP_MODE_6LoWPAN_BORDER_ROUTER) {
+                ns_fhss_ws_set_hop_count(cur->ws_info->fhss_api, 0);
+            } else {
+                //Clear OWN HOP
+                ns_fhss_ws_set_hop_count(cur->ws_info->fhss_api, 0xff);
+            }
         }
-        ns_sw_mac_fhss_register(cur->mac_api, fhss_api);
     } else {
         // Read defaults from the configuration to help FHSS testing
         const fhss_ws_configuration_t *fhss_configuration = ns_fhss_ws_configuration_get(fhss_api);
@@ -524,6 +537,7 @@ static int8_t ws_fhss_discovery_configure(protocol_interface_info_entry_t *cur)
     fhss_configuration.unicast_fixed_channel = tmp_uc_fixed_channel;
     fhss_configuration.broadcast_fixed_channel = tmp_bc_fixed_channel;
     ns_fhss_ws_configuration_set(cur->ws_info->fhss_api, &fhss_configuration);
+    ns_fhss_ws_set_hop_count(cur->ws_info->fhss_api, 0xff);
     ws_bootstrap_llc_hopping_update(cur, &fhss_configuration);
 
     return 0;

source/6LoWPAN/ws/ws_common.h

@@ -87,6 +87,7 @@ typedef struct ws_info_s {
     bool trickle_pa_running: 1;
     bool trickle_pcs_running: 1;
     bool trickle_pc_running: 1;
+    bool fhss_owner: 1;
     // default fhss parameters for this device
     uint8_t fhss_uc_dwell_interval;
     uint8_t fhss_bc_dwell_interval;