Unsecured packets will be acked by default automatically.

This will stabilize wi-sun network formation in large network and use EAPOL retry timer's for re-send purpose.

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -741,8 +741,6 @@ static void ws_llc_eapol_indication_cb(const mac_api_t *api, const mcps_data_ind
         }
         //Update Temporary Lifetime
         temp_entry->eapol_timeout = interface->ws_info->cfg->timing.temp_eapol_min_timeout + 1;
-        //SET RX Neighbour
-        ws_bootstrap_eapol_rx_temporary_set(interface, data->SrcAddr);
 
         neighbor_info.ws_neighbor = &temp_entry->neigh_info_list;
         //Storage Signal info for future ETX update possibility

source/MAC/IEEE802_15_4/mac_pd_sap.c

@@ -806,10 +806,16 @@ static int8_t mac_pd_sap_generate_ack(protocol_interface_rf_mac_setup_s *rf_ptr,
         return -1;
     }
 
-    if (mac_sec_mib_device_description_get(rf_ptr, rf_ptr->enhanced_ack_buffer.DstAddr, rf_ptr->enhanced_ack_buffer.fcf_dsn.DstAddrMode, rf_ptr->enhanced_ack_buffer.DstPANId)) {
+
+    if (rf_ptr->enhanced_ack_buffer.fcf_dsn.securityEnabled == 0 || rf_ptr->enhanced_ack_buffer.aux_header.securityLevel == 0) {
+        //Unsecured data will be acked immediately
         rf_ptr->ack_tx_possible = true;
     } else {
-        rf_ptr->ack_tx_possible = false;
+        if (mac_sec_mib_device_description_get(rf_ptr, rf_ptr->enhanced_ack_buffer.DstAddr, rf_ptr->enhanced_ack_buffer.fcf_dsn.DstAddrMode, rf_ptr->enhanced_ack_buffer.DstPANId)) {
+            rf_ptr->ack_tx_possible = true;
+        } else {
+            rf_ptr->ack_tx_possible = false;
+        }
     }
 
     return mcps_generic_ack_build(rf_ptr, true);