Squashed 'features/nanostack/sal-stack-nanostack/' changes from 715ae9a…

…..35b95da

35b95da Remove unnecessary files from release
0717432 Merge remote-tracking branch 'origin/release_internal' into release_external
f68126b Adaptation layer MCPS confirmation handle update
e483a07 Added OFDM configurations and FEC in RF config structure (ARMmbed#2513)
b88abfa BUG fix: Fixed broken Brodcast MAC overflow handling
9cad478 Random early detection congestion API update
00aed73 Modified the Wi-SUN stack Latency estimates a bit slower
6b83d82 Remove periodic PAN version increase from Wi-SUN border router
ef670e2 Integrated ReD congestion packet drop to Wi-SUN bootstrap interface.
b956d9e Revert "Improved transmission in high traffic (ARMmbed#2511)" (ARMmbed#2512)
01749c2 Improved transmission in high traffic (ARMmbed#2511)
3158e96 Adaption layer queue trace update
5a32f4a Update changelog, random_early_detection_congestion_check nameupdate and minor comment fix.
b818f12 Extented network status for support dropped tx congestion packet.
11c0763 Added new service Random early detection
f2c358d Optimized medium NWK MPL parameters to 40 second multicast interval (ARMmbed#2508)
c013bc7 Added traces to EAPOL TX failure
c29ee94 Changed TLS return value to int32_t
501a2c8 Added trace for mbed TLS errors
9d7cd22 Updated change log
1290225 Corrected radius message memory allocation
7b1c596 Removed trace print's
efb8393 Adaptation layer MCPS confirmation handle update
ac1025e Bug Fix: Accept only next possible BSI for detect BR reboot and drop unkown's.
58f0e56 Updated change log
102e525 Nanostack now indicates connection down on RPL local repair start
395791d FHSS WS: Do not allow broadcast TX on unicast channel (ARMmbed#2501)
72f8ecb Updated changelog.md
2376208 Activated higher priority by traffic class CS6 for NS/NA and RPL, EAPOL/ DHCP Relay messages.
afbe906 Adaptation layer update
13fb2bf Update CHANGELOG.md
af81c48 DIO init TX filter update
13a872c Fix typos in github template (ARMmbed#2498)
1af20e1 Initial version of CHANGELOG (ARMmbed#2497)
d9874ed Feature update: Improved MAC TX queue purge
6926442 Wi-SUN Aro registration temporary address registation bug fix.
d3170ed Removed generic event and wrong trace info.
0db3486 Removed trace from place which is normal and not needed
a080f18 Added debug tarce for dropped unsecured and MPL packets.
51cd564 Wi-SUN NS probe update:
579f756 Adaptation layer: Do not push CCA failed packet back to MAC (Wi-SUN) (ARMmbed#2487)

git-subtree-dir: features/nanostack/sal-stack-nanostack
git-subtree-split: 35b95da

nanostack/nwk_stats_api.h

@@ -73,6 +73,7 @@ typedef struct nwk_stats_t {
     /* MAC */
     uint16_t adapt_layer_tx_queue_size; /**< Adaptation layer direct TX queue size. */
     uint16_t adapt_layer_tx_queue_peak; /**< Adaptation layer direct TX queue size peak. */
+    uint32_t adapt_layer_tx_congestion_drop; /**< Adaptation layer direct TX randon early detection drop packet. */
 } nwk_stats_t;
 
 /**

nanostack/platform/arm_hal_phy.h

@@ -175,6 +175,25 @@ typedef enum {
     MODULATION_INDEX_UNDEFINED  ///< Modulation index undefined
 } phy_modulation_index_e;
 
+/** OFDM option */
+typedef enum {
+    OFDM_OPTION_1 = 1,      ///< OFDM option 1
+    OFDM_OPTION_2 = 2,      ///< OFDM option 2
+    OFDM_OPTION_3 = 3,      ///< OFDM option 3
+    OFDM_OPTION_4 = 4       ///< OFDM option 4
+} phy_ofdm_option_e;
+
+/** Modulation and coding scheme (OFDM) */
+typedef enum {
+    OFDM_MCS_0 = 0,         ///< OFDM MCS 0
+    OFDM_MCS_1 = 1,         ///< OFDM MCS 1
+    OFDM_MCS_2 = 2,         ///< OFDM MCS 2
+    OFDM_MCS_3 = 3,         ///< OFDM MCS 3
+    OFDM_MCS_4 = 4,         ///< OFDM MCS 4
+    OFDM_MCS_5 = 5,         ///< OFDM MCS 5
+    OFDM_MCS_6 = 6          ///< OFDM MCS 6
+} phy_ofdm_mcs_e;
+
 /**
  * @brief enum phy_802_15_4_mode_t IEEE 802.15.4 mode
  *
@@ -192,6 +211,9 @@ typedef struct phy_rf_channel_configuration_s {
     uint16_t number_of_channels;                ///< Number of channels
     phy_modulation_e modulation;                ///< Modulation scheme
     phy_modulation_index_e modulation_index;    ///< Modulation index
+    bool fec;                                   ///< Forward error correction, true - enabled, false - disabled
+    phy_ofdm_option_e ofdm_option;              ///< OFDM option
+    phy_ofdm_mcs_e ofdm_mcs;                    ///< OFDM modulation and coding scheme
 } phy_rf_channel_configuration_s;
 
 /** Channel page configuration */

nanostack/ws_bbr_api.h

@@ -96,7 +96,8 @@ int ws_bbr_start(int8_t interface_id, int8_t backbone_interface_id);
 #define BBR_GUA_ROUTE             0x0002 /**< More specific route is added for GUA prefix */
 #define BBR_BB_WAIT               0x0004 /**< Wait backbone availability before starting Wi-SUN network */
 #define BBR_DEFAULT_ROUTE         0x0008 /**< Add default route parameter to DIO */
-#define BBR_REQUIRE_DAO_REFRESH   0x0010 /**< Do not increment PAN version number when active forces DAO update from nodes*/
+#define BBR_REQUIRE_DAO_REFRESH   0x0000 /**< Deprecated DAO Refresh is now the default functionality*/
+#define BBR_PERIODIC_VERSION_INC  0x0010 /**< Increment PAN version number Periodically*/
 #define BBR_GUA_SLAAC             0x0020 /**< in Global prefix use SLAAC address generation to reduce traffic during bootstrap */
 
 /**

source/6LoWPAN/Bootstraps/Generic/protocol_6lowpan.c

@@ -799,15 +799,15 @@ bool protocol_6lowpan_latency_estimate_get(int8_t interface_id, uint32_t *latenc
 
     if (cur_interface->eth_mac_api) {
         // either PPP or Ethernet interface.
-        latency_estimate = 100;
+        latency_estimate = 1000;
     } else if (thread_info(cur_interface)) {
         // thread network
-        latency_estimate = 2000;
+        latency_estimate = 5000;
     } else if (ws_info(cur_interface)) {
         latency_estimate = ws_common_latency_estimate_get(cur_interface);
     } else {
         // 6LoWPAN ND
-        latency_estimate = 8000;
+        latency_estimate = 20000;
     }
 
     if (latency_estimate != 0) {

source/6LoWPAN/ND/nd_router_object.c

@@ -930,7 +930,7 @@ bool nd_ns_aro_handler(protocol_interface_info_entry_t *cur_interface, const uin
     /* TODO - check hard upper limit on registrations? */
     if (ws_info(cur_interface)) {
 
-        aro_out->status = ws_common_allow_child_registration(cur_interface, aro_out->eui64);
+        aro_out->status = ws_common_allow_child_registration(cur_interface, aro_out->eui64, aro_out->lifetime);
         if (aro_out->status != ARO_SUCCESS) {
             aro_out->present = true;
             return true;