Fix for C-plane connection failure in 64UEs test.

openair2/LAYER2/MAC/eNB_scheduler_RA.c

@@ -1168,7 +1168,7 @@ generate_Msg4(module_id_t module_idP, int CC_idP, frame_t frameP,
 		mac->TX_req[CC_idP].sfn_sf =
 		    fill_nfapi_tx_req(&mac->TX_req[CC_idP].tx_request_body,
 				      (frameP * 10) + subframeP,
-				      rrc_sdu_length,
+				      rrc_sdu_length + offset,
 				      mac->pdu_index[CC_idP],
 				      mac->UE_list.
 				      DLSCH_pdu[CC_idP][0][(unsigned char)UE_id].payload[0]);

openair2/LAYER2/MAC/mac_vars.h

@@ -95,7 +95,7 @@ const uint8_t cqi2fmt2x_agg[MAX_SUPPORTED_BW][CQI_VALUE_RANGE] = {
 
 uint32_t RRC_CONNECTION_FLAG;
 
-UE_MAC_INST *UE_mac_inst;	//[NB_MODULE_MAX];
+UE_MAC_INST *UE_mac_inst = NULL;	//[NB_MODULE_MAX];
 MAC_RLC_XFACE *Mac_rlc_xface;
 
 /// Primary component carrier index of eNB

openair2/RRC/LTE/rrc_vars.h

@@ -38,7 +38,7 @@
 
 UE_PF_PO_t UE_PF_PO[NFAPI_CC_MAX][MAX_MOBILES_PER_ENB];
 pthread_mutex_t ue_pf_po_mutex;
-UE_RRC_INST *UE_rrc_inst;
+UE_RRC_INST *UE_rrc_inst = NULL;
 #include "LAYER2/MAC/mac_extern.h"
 #define MAX_U32 0xFFFFFFFF
 

targets/RT/USER/lte-ue.c

@@ -1042,9 +1042,7 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
 
     	UL_INFO->sr_ind.sr_indication_body.sr_pdu_list = (nfapi_sr_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_sr_indication_pdu_t));
      	UL_INFO->sr_ind.sr_indication_body.number_of_srs = 0;
-        UL_INFO->cqi_ind.cqi_pdu_list =  (nfapi_cqi_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_pdu_t));
-        UL_INFO->cqi_ind.cqi_raw_pdu_list = (nfapi_cqi_indication_raw_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_raw_pdu_t));
-        UL_INFO->cqi_ind.number_of_cqis = 0;
+
         UL_INFO->cqi_ind.cqi_pdu_list =  (nfapi_cqi_indication_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_pdu_t));
         UL_INFO->cqi_ind.cqi_raw_pdu_list = (nfapi_cqi_indication_raw_pdu_t*)malloc(NB_UE_INST*sizeof(nfapi_cqi_indication_raw_pdu_t));
         UL_INFO->cqi_ind.number_of_cqis = 0;