From: Harshita Lal <harshita.lal@radisys.com>
Date: Tue, 6 Sep 2022 12:46:11 +0000 (+0000)
Subject: Merge "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-469] Chnages in Drx-config asn structu... 
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a0c99eea3978b9aa204e002c438a51df77cf92dd;hp=-c;p=o-du%2Fl2.git

Merge "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-469] Chnages in Drx-config asn structure in RRC asn file V 15.3"
---

a0c99eea3978b9aa204e002c438a51df77cf92dd
diff --combined src/cu_stub/cu_f1ap_msg_hdl.c
index e41d041de,4e0205444..bc765bca6
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@@ -5270,7 -5270,7 +5270,7 @@@ uint8_t BuildSchedulingReqConfig(struc
   * ****************************************************************/
  uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
  {
-    macCellGrpCfg->drx_Config = NULLP;
+    macCellGrpCfg->drx_ConfigRrc = NULLP;
     macCellGrpCfg->schedulingRequestConfig = NULLP;
     CU_ALLOC(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
     if(!macCellGrpCfg->schedulingRequestConfig)
@@@ -11517,11 -11517,13 +11517,11 @@@ void procF1SetupReq(uint32_t *destDuId
                if(duDb == NULLP)
                {
                   duDb = &cuCb.duInfo[cuCb.numDu];
 -                 memset(duDb, 0, sizeof(DuDb));
 -                 duDb->duId = duId;
                   cuCb.numDu++;
 -                 *destDuId = duId;
                }
 -              else
 -                 return;
 +              memset(duDb, 0, sizeof(DuDb));
 +              duDb->duId = duId;
 +              *destDuId = duId;
                break;
             }
           case ProtocolIE_ID_id_gNB_DU_Name: