From da6fd12625a70c0b3e4b38c66ac4b50e4b3c2e75 Mon Sep 17 00:00:00 2001 From: Juha Heiskanen Date: Tue, 26 Feb 2019 13:36:13 +0200 Subject: [PATCH] Fixed Default small network setup set to follow standard. Change-Id: I37b017dfd7070a2b151a097294cfadb75f8817ad --- source/6LoWPAN/ws/ws_common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/6LoWPAN/ws/ws_common.c b/source/6LoWPAN/ws/ws_common.c index 88abf84acb8..68100b60d37 100644 --- a/source/6LoWPAN/ws/ws_common.c +++ b/source/6LoWPAN/ws/ws_common.c @@ -274,6 +274,7 @@ int8_t ws_common_allocate_and_init(protocol_interface_info_entry_t *cur) cur->ws_info->hopping_schdule.operating_mode = OPERATING_MODE_3; cur->ws_info->hopping_schdule.operating_class = 2; ws_common_regulatory_domain_config(cur); + cur->ws_info->network_size_config = NETWORK_SIZE_AUTOMATIC; ws_common_network_size_configure(cur, 10); // defaults to small network size // Set defaults for the device. user can modify these. @@ -302,7 +303,12 @@ void ws_common_network_size_configure(protocol_interface_info_entry_t *cur, uint // imin: 14 (16s) // doublings:3 (128s) // redundancy; 0 Disabled - ws_bbr_rpl_config(14, 3, 0); + if (cur->ws_info->network_size_config == NETWORK_SIZE_AUTOMATIC) { + ws_bbr_rpl_config(14, 3, 0); + } else { + ws_bbr_rpl_config(0, 0, 0); + } + } else if (network_size < 300) { // Configure the Wi-SUN discovery trickle parameters cur->ws_info->trickle_params_pan_discovery = trickle_params_pan_discovery_medium;