[Task-ID: ODUHIGH-505] Fix in RRC Setup procedure

[o-du/l2.git] / src / 5gnrmac / mac_demux.c

diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c
index d244d57..02b9e11 100644 (file)
--- a/src/5gnrmac/mac_demux.c
+++ b/src/5gnrmac/mac_demux.c
@@ -143,16 +143,6 @@ uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxD
                pduLen -= length;
                rxPduIdx = rxPduIdx + length;
 
-               /* Delete RA cb once RRC setup complete received */
-               if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == rxDataIndPdu->rnti)
-               {
-                  MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu, \
-                        macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
-                  MAC_FREE(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
-                        macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize - TX_PAYLOAD_HDR_LEN);
-                  memset(&macCb.macCell[cellIdx]->macRaCb[ueIdx], 0, sizeof(MacRaCbInfo));
-               }
-
                /* Send UL Data to RLC */
                ret = macProcUlData(cellId, rxDataIndPdu->rnti, slotInfo, lcId, length, pdu);
 
@@ -192,7 +182,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxD
             {
                uint8_t  lcgId         = 0;
                uint8_t  bufferSizeIdx = 0;
-               uint8_t  crnti         = 0;
+               uint16_t  crnti         = 0;
                uint32_t bufferSize    = 0;
 
                pduLen--;
@@ -217,7 +207,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxD
                DataVolInfo dataVolInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS];
                memset(dataVolInfo, 0,MAX_NUM_LOGICAL_CHANNEL_GROUPS * sizeof(DataVolInfo));
                uint8_t  lcgIdx        = 0;
-               uint8_t  crnti         = 0;
+               uint16_t  crnti         = 0;
                uint8_t  numLcg        = 0;
                uint8_t  lcgIdxPos     = 0;
                pduLen--;