change RLC discard log to total counter log.

(cherry picked from commit e9917cb9bd43f9e280b78a5c6cfbb2ed74b6e058)

# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c

openair2/LAYER2/MAC/eNB_scheduler.c

@@ -809,10 +809,6 @@ void update_ue_timers(module_id_t module_idP,frame_t frameP, sub_frame_t subfram
               UE_scheduling_control->ret_cnt[CC_id],
               UE_scheduling_control->aperiodic_ri_received[CC_id]
         );
-        
-        pthread_mutex_lock(&(UE_scheduling_control->rlc_out_of_resources_lock));
-        UE_scheduling_control->rlc_out_of_resources_cnt = 0;
-        pthread_mutex_unlock(&(UE_scheduling_control->rlc_out_of_resources_lock));
       }
 
       RC.eNB[module_idP][CC_id]->pusch_stats_bsr[UE_id][(frameP * 10) + subframeP] = -63;

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2673,12 +2673,9 @@ add_new_ue(module_id_t mod_idP,
     UE_list->UE_sched_ctrl[UE_id].pusch_bler[cc_idP] = 0;
     UE_list->UE_sched_ctrl[UE_id].ret_cnt[cc_idP] = 0;
     UE_list->UE_sched_ctrl[UE_id].first_cnt[cc_idP] = 0;
-    
     UE_list->UE_sched_ctrl[UE_id].volte_configured = FALSE;
     UE_list->UE_sched_ctrl[UE_id].ul_periodic_timer_exp_flag = FALSE;
-
     UE_list->UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt = 0;
-    pthread_mutex_init(&UE_list->UE_sched_ctrl[UE_id].rlc_out_of_resources_lock, NULL);
 
     for (j = 0; j < 8; j++) {
         UE_list->UE_template[cc_idP][UE_id].oldNDI[j][TB1] = (j == 0) ? 1 : 0;    // 1 because first transmission is with format1A (Msg4) for harq_pid 0

openair2/LAYER2/MAC/mac.h

@@ -1114,7 +1114,6 @@ typedef struct {
     uint8_t swap_flag[NFAPI_CC_MAX][MAX_HARQ_PID];
     uint8_t rsn[NFAPI_CC_MAX][MAX_HARQ_PID][MAX_NUM_TB];
     uint32_t rlc_out_of_resources_cnt;
-    pthread_mutex_t rlc_out_of_resources_lock;
 } UE_sched_ctrl_t;
 
 /*! \brief eNB template for the Random access information */

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -403,9 +403,7 @@ boolean_t pdcp_data_req(
             for (UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
               if (RC.mac[ctxt_pP->module_id]->UE_list.active[UE_id] == TRUE) {
                 if (RC.mac[ctxt_pP->module_id]->UE_list.UE_template[RC.mac[ctxt_pP->module_id]->UE_list.pCC_id[UE_id]][UE_id].rnti == ctxt_pP->rnti) {
-                    pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
                     RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
-                    pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
                     break;
                 }
               }
@@ -473,9 +471,7 @@ boolean_t pdcp_data_req(
             for (UE_id = 0; UE_id < MAX_MOBILES_PER_ENB; UE_id++) {
               if (RC.mac[ctxt_pP->module_id]->UE_list.active[UE_id] == TRUE) {
                 if (RC.mac[ctxt_pP->module_id]->UE_list.UE_template[RC.mac[ctxt_pP->module_id]->UE_list.pCC_id[UE_id]][UE_id].rnti == ctxt_pP->rnti) {
-                    pthread_mutex_lock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
                     RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_cnt++;
-                    pthread_mutex_unlock(&(RC.mac[ctxt_pP->module_id]->UE_list.UE_sched_ctrl[UE_id].rlc_out_of_resources_lock));
                     break;
                 }
               }