Fixed ETX update at LLC layer.

LLC message free was too early so etx update is now in correct place.

Change-Id: Ib399079ab78b036784c68d04ed415ee266a1874e

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -192,6 +192,7 @@ static llc_message_t * llc_message_allocate(uint16_t ie_buffer_size,llc_data_bas
     if (!message) {
         return NULL;
     }
+    message->ack_requested = false;
 
     //Guarantee
     while(1) {
@@ -371,7 +372,33 @@ static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *
 
     uint8_t messsage_type = message->messsage_type;
     uint8_t mpx_user_handle = message->mpx_user_handle;
+    //ETX update
+    if (message->ack_requested && messsage_type == WS_FT_DATA ) {
 
+        ws_neighbor_class_entry_t * ws_neighbor = NULL;
+        mac_neighbor_table_entry_t *neighbor = NULL;
+        bool success = false;
+
+        switch (data->status) {
+            case MLME_SUCCESS:
+            case MLME_TX_NO_ACK:
+            case MLME_NO_DATA:
+                if (data->status == MLME_SUCCESS ) {
+                    success = true;
+                }
+                neighbor = mac_neighbor_table_address_discover(interface->mac_parameters->mac_neighbor_table, message->dst_address, message->dst_address_type);
+                if (neighbor) {
+                    ws_neighbor =  ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor->index);
+                }
+                if (ws_neighbor) {
+                    etx_transm_attempts_update(interface->id, 1 + data->tx_retries , success, neighbor->index);
+                    //TODO discover RSL from Enchanced ACK Header IE elements
+                }
+                break;
+            default:
+                break;
+        }
+    }
     //Free message
     llc_message_free(message, base);
 
@@ -384,34 +411,6 @@ static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *
             mpx_user_id = MPX_KEY_MANAGEMENT_ENC_USER_ID;
         }
 
-        //ETX update
-        if (message->ack_requested && messsage_type == WS_FT_DATA ) {
-
-            ws_neighbor_class_entry_t * ws_neighbor = NULL;
-            mac_neighbor_table_entry_t *neighbor = NULL;
-            bool success = false;
-
-            switch (data->status) {
-                case MLME_SUCCESS:
-                case MLME_TX_NO_ACK:
-                case MLME_NO_DATA:
-                    if (data->status == MLME_SUCCESS ) {
-                        success = true;
-                    }
-                    neighbor = mac_neighbor_table_address_discover(interface->mac_parameters->mac_neighbor_table, message->dst_address, message->dst_address_type);
-                    if (neighbor) {
-                        ws_neighbor =  ws_neighbor_class_entry_get(&interface->ws_info->neighbor_storage, neighbor->index);
-                    }
-                    if (ws_neighbor) {
-                        etx_transm_attempts_update(interface->id, 1 + data->tx_retries , success, neighbor->index);
-                        //TODO discover RSL from Enchanced ACK Header IE elements
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-
         user_cb = ws_llc_mpx_user_discover(&base->mpx_data_base, mpx_user_id);
         if (user_cb && user_cb->data_confirm) {
             //Call MPX registered call back