<[Epic-ID: ODUHIGH-518] : WG8 Alignment | Removed UEID in MAC-SCH UeCreate/UeReconfig...

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

diff --git a/src/5gnrmac/mac_ue_mgr.c b/src/5gnrmac/mac_ue_mgr.c
index cea9305..e38ef94 100644 (file)
--- a/src/5gnrmac/mac_ue_mgr.c
+++ b/src/5gnrmac/mac_ue_mgr.c
@@ -1841,7 +1841,6 @@ uint8_t fillSchUeCfg(SchUeCfgReq *schUeCfg, MacUeCreateReq *ueCfg)
    uint8_t ret = ROK;
 
    schUeCfg->cellId = ueCfg->cellId;
-   schUeCfg->ueId = ueCfg->ueId;
    schUeCfg->crnti = ueCfg->crnti;
    /* Copy MAC cell group config */
    if(ueCfg->macCellGrpCfgPres == true)
@@ -1932,7 +1931,6 @@ uint8_t fillSchUeRecfg(SchUeRecfgReq *schUeRecfg, MacUeRecfg *ueRecfg)
    uint8_t ret = ROK;
 
    schUeRecfg->cellId = ueRecfg->cellId;
-   schUeRecfg->ueId = ueRecfg->ueId;
    schUeRecfg->crnti = ueRecfg->crnti;
    schUeRecfg->dataTransmissionInfo = ueRecfg->transmissionAction;
    /* Copy MAC cell group config */
@@ -2838,7 +2836,7 @@ uint8_t MacSendUeCreateRsp(MacRsp result, SchUeCfgRsp *schCfgRsp)
    /* Filling UE Config response */
    memset(cfgRsp, 0, sizeof(MacUeCreateRsp));
    cfgRsp->cellId = schCfgRsp->cellId;
-   cfgRsp->ueId = schCfgRsp->ueId;
+   GET_UE_ID(schCfgRsp->crnti, cfgRsp->ueId);
    cfgRsp->result = result;
 
    /* Fill Post structure and send UE Create response*/
@@ -2878,7 +2876,7 @@ uint8_t MacSendUeReconfigRsp(MacRsp result, SchUeRecfgRsp *schCfgRsp)
    /* Filling UE Config response */
    memset(recfgRsp, 0, sizeof(MacUeRecfgRsp));
    recfgRsp->cellId = schCfgRsp->cellId;
-   recfgRsp->ueId = schCfgRsp->ueId;
+   GET_UE_ID(schCfgRsp->crnti, recfgRsp->ueId);
    recfgRsp->result = result;
 
    /* Fill Post structure and send UE Create response*/
@@ -2973,7 +2971,7 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
 {
    uint8_t result = MAC_DU_APP_RSP_NOK;
    uint8_t ret = ROK;
-   uint16_t cellIdx;
+   uint16_t cellIdx = 0, ueId = 0;
    MacUeCreateReq *ueCfg = NULLP;
 
 #ifdef CALL_FLOW_DEBUG_LOG
@@ -2992,7 +2990,8 @@ uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *schCfgRsp)
 #endif
 
    GET_CELL_IDX(schCfgRsp->cellId, cellIdx);
-   ueCfg = getMacUeCfg(cellIdx, schCfgRsp->ueId);
+   GET_UE_ID(schCfgRsp->crnti, ueId);
+   ueCfg = getMacUeCfg(cellIdx, ueId);
    if(ueCfg == NULLP)
    {
       DU_LOG("\nERROR  -->  MAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event);
@@ -3043,7 +3042,7 @@ uint8_t MacProcSchUeRecfgRsp(Pst *pst, SchUeRecfgRsp *schRecfgRsp)
 {
    uint8_t result = MAC_DU_APP_RSP_NOK;
    uint8_t ret = ROK;
-   uint16_t cellIdx;
+   uint16_t cellIdx = 0, ueId = 0;
    MacUeRecfg *ueRecfg = NULLP;
    
 #ifdef CALL_FLOW_DEBUG_LOG
@@ -3059,7 +3058,8 @@ uint8_t MacProcSchUeRecfgRsp(Pst *pst, SchUeRecfgRsp *schRecfgRsp)
 #endif
 
    GET_CELL_IDX(schRecfgRsp->cellId, cellIdx);
-   ueRecfg = getMacUeRecfg(cellIdx, schRecfgRsp->ueId);
+   GET_UE_ID(schRecfgRsp->crnti, ueId);
+   ueRecfg = getMacUeRecfg(cellIdx, ueId);
    if(ueRecfg == NULLP)
    {
       DU_LOG("\nERROR  -->  MAC : Failed to find the Mac Ue Cfg for event [%d] in MacProcSchUeCfgRsp()", pst->event);