Fix merge compile problems

Change-Id: I4ef7af5e7ef0daacbbec01ea45906bf7e8afa931

Author: Juha Heiskanen

source/6LoWPAN/Thread/thread_router_bootstrap.c

@@ -1562,9 +1562,9 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                 if (thread_am_reed(cur)) {
                     if (thread_router_parent_address_check(cur, mle_msg->packet_src_address)) {
                         tr_debug("Child ID req from own parent -> connection error");
-                        entry_temp = mle_class_get_entry_by_ll64(cur->id, linkMargin, mle_msg->packet_src_address, false, NULL);
+                        entry_temp = mac_neighbor_entry_get_by_ll64(mac_neighbor_info(cur), mle_msg->packet_src_address, false, NULL);
                         if (entry_temp) {
-                            mle_class_remove_entry(cur->id, entry_temp);
+                            mac_neighbor_table_neighbor_remove(mac_neighbor_info(cur), entry_temp);
                         }
                         thread_bootstrap_connection_error(cur->id, CON_PARENT_CONNECT_DOWN, NULL);
                         return;
@@ -1908,7 +1908,7 @@ void thread_router_bootstrap_mle_receive_cb(int8_t interface_id, mle_message_t *
                     if (mle_tlv_read_8_bit_tlv(MLE_TYPE_STATUS, mle_msg->data_ptr, mle_msg->data_length, &status)) {
                         if (1 == status && thread_check_is_this_my_parent(cur, entry_temp)) {
                             tr_debug("Parent has removed REED");
-                            mle_class_remove_entry(cur->id, entry_temp);
+                            mac_neighbor_table_neighbor_remove(mac_neighbor_info(cur), entry_temp);
                             thread_bootstrap_connection_error(cur->id, CON_PARENT_CONNECT_DOWN, NULL);
                         }
                         return;

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -1804,7 +1804,7 @@ static int8_t mcps_generic_packet_rebuild(protocol_interface_rf_mac_setup_s *rf_
 static int8_t mcps_pd_data_cca_trig(protocol_interface_rf_mac_setup_s *rf_ptr, mac_pre_build_frame_t *buffer)
 {
     mac_mlme_mac_radio_enable(rf_ptr);
-
+    rf_ptr->macTxProcessActive = true;
     if (rf_ptr->rf_csma_extension_supported) {
         //Write TX time
         bool cca_enabled;
@@ -1815,12 +1815,13 @@ static int8_t mcps_pd_data_cca_trig(protocol_interface_rf_mac_setup_s *rf_ptr, m
         }
         mac_pd_sap_set_phy_tx_time(rf_ptr, buffer->tx_time, cca_enabled);
         if (mac_plme_cca_req(rf_ptr) != 0) {
+            rf_ptr->macTxProcessActive = false;
             return -1;
         }
     } else {
         timer_mac_start(rf_ptr, MAC_TIMER_CCA, (uint16_t)(buffer->tx_time / 50));
     }
-    rf_ptr->macTxProcessActive = true;
+
     return 0;
 }
 

source/MAC/IEEE802_15_4/mac_pd_sap.c

@@ -264,8 +264,6 @@ void mac_pd_sap_state_machine(protocol_interface_rf_mac_setup_s *rf_mac_setup)
         } else if (rf_mac_setup->mac_tx_result == MAC_TIMER_ACK) {
             mac_data_interface_tx_done_cb(rf_mac_setup,PHY_LINK_TX_FAIL, 0, 0 );
         }
-    } else {
-        tr_debug("State machine %u, %u, %u", rf_mac_setup->mac_tx_result, rf_mac_setup->macUpState, rf_mac_setup->macTxProcessActive);
     }
 }
 
@@ -380,7 +378,6 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
             if (rf_ptr->active_pd_data_request->fcf_dsn.securityEnabled) {
                 uint32_t current_counter = mac_mlme_framecounter_get(rf_ptr);
                 if (mac_data_counter_too_small(current_counter, rf_ptr->active_pd_data_request->aux_header.frameCounter)) {
-                    tr_debug("HOXS counter %u < ack counter %u", rf_ptr->active_pd_data_request->aux_header.frameCounter, rf_ptr->security_frame_counter);
                     rf_ptr->active_pd_data_request->aux_header.frameCounter = current_counter;
                     mac_mlme_framecounter_increment(rf_ptr);
                 }
@@ -708,7 +705,6 @@ int8_t mac_pd_sap_data_cb(void *identifier, arm_phy_sap_msg_t *message)
 
         //Parse IE Elements
         if (!mac_header_information_elements_parse(buffer)) {
-            tr_debug("Drop by IE");
             goto ERROR_HANDLER;
         }