tentative fix for RRC reconfiguration after UE capabilities

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -336,6 +336,7 @@ void nr_set_pdsch_semi_static(const NR_ServingCellConfigCommon_t *scc,
       ps->mcsTableIdx = 2;
   }
   else ps->mcsTableIdx = 0;
+  LOG_D(NR_MAC,"MCS Table Index: %d\n",ps->mcsTableIdx);
 
   if(dci_format == 0) // format 1_0
     ps->numDmrsCdmGrpsNoData = (ps->nrOfSymbols == 2 ? 1 : 2);

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1402,6 +1402,8 @@ void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig,
                             NR_UE_NR_Capability_t *uecap) {
 
   NR_SpCellConfig_t *SpCellConfig = cellGroupConfig->spCellConfig;
+  if (SpCellConfig == NULL) return;
+
   NR_ServingCellConfigCommon_t *scc = carrier->servingcellconfigcommon;
 
   NR_BWP_DownlinkDedicated_t *bwp_Dedicated = SpCellConfig->spCellConfigDedicated->initialDownlinkBWP;

openair2/RRC/NR/rrc_gNB.c

@@ -748,6 +748,8 @@ rrc_gNB_generate_defaultRRCReconfiguration(
     dedicatedNAS_MessageList = NULL;
   }
 
+  gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
+  gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
   memset(buffer, 0, sizeof(buffer));
   size = do_RRCReconfiguration(ctxt_pP, buffer, sizeof(buffer),
                                 xid,
@@ -758,10 +760,10 @@ rrc_gNB_generate_defaultRRCReconfiguration(
                                 NULL,
                                 NULL,
                                 dedicatedNAS_MessageList,
+                                ue_context_pP,
+                                &rrc->carrier,
                                 NULL,
-                                NULL,
-                                NULL,
-                                NULL);
+                                ue_p->masterCellGroup);
 
   free(ue_context_pP->ue_context.nas_pdu.buffer);