Fix for RAR and DL dedicated PDU length [Issue-Id: ODUHIGH-348]

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

diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c
index 0233223..dcbf870 100644 (file)
--- a/src/5gnrmac/mac_slot_ind.c
+++ b/src/5gnrmac/mac_slot_ind.c
@@ -125,6 +125,7 @@ void fillMsg4Pdu(uint16_t cellId, DlMsgAlloc *msg4Alloc)
 {
    uint8_t   ueIdx;
    uint16_t  cellIdx;
+   uint16_t  msg4TxPduLen;
    MacDlData msg4DlData;
    MacCeInfo  macCeData;
 
@@ -135,45 +136,49 @@ void fillMsg4Pdu(uint16_t cellId, DlMsgAlloc *msg4Alloc)
 
    GET_UE_IDX(msg4Alloc->dlMsgInfo.crnti, ueIdx);
    ueIdx = ueIdx -1;
+
+   if(macCb.macCell[cellIdx] == NULLP)
+   {
+      DU_LOG("\nERROR -->  MAC: Cell Id[%d] not found", cellId);
+      return;
+   }
+
    if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu != NULLP)
    {
-      MAC_ALLOC(msg4DlData.pduInfo[ueIdx].dlPdu, \
-           macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
+      MAC_ALLOC(msg4DlData.pduInfo[ueIdx].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
       if(msg4DlData.pduInfo[ueIdx].dlPdu != NULLP)
       {
-        fillMsg4DlData(&msg4DlData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen,\
+         msg4TxPduLen = macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize - TX_PAYLOAD_HDR_LEN;
+
+         fillMsg4DlData(&msg4DlData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen, \
             macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu);
-        fillMacCe(&macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg3Pdu);
-        /* Forming Mux Pdu */
-        macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu = NULLP;
-        MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
-           macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
-        if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu != NULLP)
-        {
-           memset(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, 0, \
-              macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
-           macMuxPdu(&msg4DlData, &macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu,\
-                 macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize);
-
-        }
-        else
-        {
-           DU_LOG("\nERROR  -->  MAC: Failed allocating memory for msg4TxPdu");
-        }
-        /* Free memory allocated */
-        MAC_FREE(msg4DlData.pduInfo[0].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
+         fillMacCe(&macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg3Pdu);
+         /* Forming Mux Pdu */
+         macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu = NULLP;
+         MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, msg4TxPduLen);
+         if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu != NULLP)
+         {
+            memset(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, 0, msg4TxPduLen);
+            macMuxPdu(&msg4DlData, &macCeData, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, msg4TxPduLen);
+         }
+         else
+         {
+            DU_LOG("\nERROR  -->  MAC: Failed allocating memory for msg4TxPdu");
+         }
+         /* Free memory allocated */
+         MAC_FREE(msg4DlData.pduInfo[0].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen);
       }
    }
 
    /* storing msg4 Pdu in macDlSlot */
    if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu)
    {
-      msg4Alloc->dlMsgInfo.dlMsgPduLen = macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize;
+      msg4Alloc->dlMsgInfo.dlMsgPduLen = msg4TxPduLen;
       MAC_ALLOC(msg4Alloc->dlMsgInfo.dlMsgPdu, msg4Alloc->dlMsgInfo.dlMsgPduLen);
       if(msg4Alloc->dlMsgInfo.dlMsgPdu != NULLP)
       {
-        memcpy(msg4Alloc->dlMsgInfo.dlMsgPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
-              msg4Alloc->dlMsgInfo.dlMsgPduLen);
+         memcpy(msg4Alloc->dlMsgInfo.dlMsgPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TxPdu, \
+               msg4Alloc->dlMsgInfo.dlMsgPduLen);
       }
    }
    else