Skip to content

O
OpenXG-RAN
Commit 2a1d1134 authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

log an error if UE is -1 in rrc_mac_config_req

parent 2c578f35
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 6 deletions
openair2/LAYER2/MAC/config.c
View file @ 2a1d1134
...@@ -195,12 +195,16 @@ rrc_mac_config_req( ...@@ -195,12 +195,16 @@ rrc_mac_config_req(
} }
} }
else { else {
if (UE_id == -1) {
LOG_E(MAC,"%s:%d:%s: ERROR, UE_id == -1\n", __FILE__, __LINE__, __FUNCTION__);
} else {
if (logicalChannelConfig) if (logicalChannelConfig)
UE_list->UE_template[CC_idP][UE_id].lcgidmap[logicalChannelIdentity] = *logicalChannelConfig->ul_SpecificParameters->logicalChannelGroup; UE_list->UE_template[CC_idP][UE_id].lcgidmap[logicalChannelIdentity] = *logicalChannelConfig->ul_SpecificParameters->logicalChannelGroup;
else else
UE_list->UE_template[CC_idP][UE_id].lcgidmap[logicalChannelIdentity] = 0; UE_list->UE_template[CC_idP][UE_id].lcgidmap[logicalChannelIdentity] = 0;
} }
} }
}
if (mac_MainConfig != NULL) { if (mac_MainConfig != NULL) {
if (eNB_flagP==0) { if (eNB_flagP==0) {
...@@ -296,6 +300,9 @@ rrc_mac_config_req( ...@@ -296,6 +300,9 @@ rrc_mac_config_req(
if (physicalConfigDedicated != NULL) { if (physicalConfigDedicated != NULL) {
if (eNB_flagP==1) { if (eNB_flagP==1) {
if (UE_id == -1)
LOG_E(MAC,"%s:%d:%s: ERROR, UE_id == -1\n", __FILE__, __LINE__, __FUNCTION__);
else
mac_xface->phy_config_dedicated_eNB(Mod_idP, CC_idP, UE_RNTI(Mod_idP, UE_id), physicalConfigDedicated); mac_xface->phy_config_dedicated_eNB(Mod_idP, CC_idP, UE_RNTI(Mod_idP, UE_id), physicalConfigDedicated);
} else { } else {
mac_xface->phy_config_dedicated_ue(Mod_idP,0,eNB_index,physicalConfigDedicated); mac_xface->phy_config_dedicated_ue(Mod_idP,0,eNB_index,physicalConfigDedicated);
...@@ -308,6 +315,9 @@ rrc_mac_config_req( ...@@ -308,6 +315,9 @@ rrc_mac_config_req(
if (sCellToAddMod_r10 != NULL) { if (sCellToAddMod_r10 != NULL) {
if (eNB_flagP==1) { if (eNB_flagP==1) {
if (UE_id == -1)
LOG_E(MAC,"%s:%d:%s: ERROR, UE_id == -1\n", __FILE__, __LINE__, __FUNCTION__);
else
mac_xface->phy_config_dedicated_scell_eNB(Mod_idP,UE_RNTI(Mod_idP,UE_id),sCellToAddMod_r10,1); mac_xface->phy_config_dedicated_scell_eNB(Mod_idP,UE_RNTI(Mod_idP,UE_id),sCellToAddMod_r10,1);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment