Skip to content

Commit 7fb321e

Browse files
author
Juha Heiskanen
authored
Merge pull request #1906 from ARMmbed/parent_update_fix
Fixed missing broadcast synch information loose with default zeroes.
2 parents 3dbc874 + b5afc35 commit 7fb321e

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

source/6LoWPAN/ws/ws_bootstrap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,9 @@ static void ws_bootstrap_primary_parent_set(struct protocol_interface_info_entry
481481

482482
memcpy(&fhss_configuration, ns_fhss_ws_configuration_get(cur->ws_info->fhss_api), sizeof(fhss_ws_configuration_t));
483483

484-
ws_fhss_set_defaults(cur, &fhss_configuration);
485-
486484
// Learning broadcast network configuration
487485
if (neighbor_info->ws_neighbor->broadcast_shedule_info_stored) {
486+
ws_fhss_set_defaults(cur, &fhss_configuration);
488487
fhss_configuration.ws_bc_channel_function = neighbor_info->ws_neighbor->fhss_data.bc_timing_info.broadcast_channel_function;
489488
if (fhss_configuration.ws_bc_channel_function == WS_FIXED_CHANNEL) {
490489
cur->ws_info->hopping_schdule.bc_fixed_channel = neighbor_info->ws_neighbor->fhss_data.bc_timing_info.fixed_channel;

0 commit comments

Comments
 (0)