X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_f1ap_msg_hdl.c;h=2d8a8a9cdfdd8b19526fe7a236b41bda1315cee6;hb=66916eaaf8212d36b38e4dba88bdf159d7637779;hp=21f3b70bb0b9388cba7bd666a8cec7b13e68ed46;hpb=d18338bde70b043c3dde28b7d88d128c0b138380;p=o-du%2Fl2.git

diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c
index 21f3b70bb..2d8a8a9cd 100644
--- a/src/du_app/du_f1ap_msg_hdl.c
+++ b/src/du_app/du_f1ap_msg_hdl.c
@@ -6471,9 +6471,6 @@ void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
             {
 	       macPdschCfg->timeDomRsrcAllociList[timeDomIdx].mappingType = \
 	          timeDomAlloc->choice.setup->list.array[timeDomIdx]->mappingType;
-	       //macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbol = \
-	          
-	       //macPdschCfg->timeDomRsrcAllociList[timeDomIdx].symbolLength;
 	       macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbolAndLength = \
 	          timeDomAlloc->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
 	    }
@@ -6687,13 +6684,9 @@ void extractPuschCfg(struct BWP_UplinkDedicated__pusch_Config *cuPuschCfg, Pusch
 		     macPuschCfg->timeDomRsrcAllocList[timeDomIdx].k2 = \
 		        *(timeDomAllocList->choice.setup->list.array[timeDomIdx]->k2);
                      macPuschCfg->timeDomRsrcAllocList[timeDomIdx].mappingType = \
-                     		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->mappingType;
+                        timeDomAllocList->choice.setup->list.array[timeDomIdx]->mappingType;
                      macPuschCfg->timeDomRsrcAllocList[timeDomIdx].startSymbolAndLength = \
 		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
-                    //macPuschCfg->timeDomRsrcAllocList[timeDomIdx].startSymbol = \
-		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->startSymbol;
-                    //macPuschCfg->timeDomRsrcAllocList[timeDomIdx].symbolLen = \
-		        timeDomAllocList->choice.setup->list.array[timeDomIdx]->symbolLen;
                   }
 	       }
 	    }
@@ -7384,7 +7377,14 @@ uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
 	    }
 	 case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
 	    {
-	       duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+	       if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+	       {
+		  duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+	       }
+	       else
+	       {
+		  DU_LOG("\nIgnoring delivery report, since rrcContainer is not present");
+	       }
 	       break;
 	    }
 	 //TODO: To handle maxAggrBitRate case,