maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When freeing UE contexts, check in both possible lists

Browse Source
This commit is contained in:
Robert Schmidt
2025-07-02 17:42:00 +02:00
parent 249812e10d
commit 75be2a1a59
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1 -1
View File
@@ -2242,7 +2242,7 @@ void nr_release_ra_UE(gNB_MAC_INST *mac, rnti_t rnti)
if (UE) { if (UE) {
delete_nr_ue_data(UE, mac->common_channels, &UE_info->uid_allocator); delete_nr_ue_data(UE, mac->common_channels, &UE_info->uid_allocator);
} else { } else {
LOG_W(NR_MAC,"Call to del rnti %04x, but not existing\n", rnti); LOG_W(NR_MAC,"Call to release RA UE with rnti %04x, but not existing\n", rnti);
} }
} }
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+6 -3
View File
@@ -2621,6 +2621,8 @@ NR_UE_info_t *remove_UE_from_list(int list_size, NR_UE_info_t *list[list_size],
{ {
for (int i = 0; i < list_size; i++) { for (int i = 0; i < list_size; i++) {
NR_UE_info_t *curr_UE = list[i]; NR_UE_info_t *curr_UE = list[i];
if (!curr_UE)
break; /* reached the end of the list */
if (curr_UE->rnti != rnti) if (curr_UE->rnti != rnti)
continue; continue;
@@ -2629,7 +2631,6 @@ NR_UE_info_t *remove_UE_from_list(int list_size, NR_UE_info_t *list[list_size],
list[list_size - 1] = NULL; list[list_size - 1] = NULL;
return curr_UE; return curr_UE;
} }
LOG_E(NR_MAC, "UE %04x to be removed not found in list\n", rnti);
return NULL; return NULL;
} }
@@ -2735,8 +2736,10 @@ void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti)
NR_SCHED_LOCK(&UE_info->mutex); NR_SCHED_LOCK(&UE_info->mutex);
NR_UE_info_t *UE = remove_UE_from_list(MAX_MOBILES_PER_GNB + 1, UE_info->connected_ue_list, rnti); NR_UE_info_t *UE = remove_UE_from_list(MAX_MOBILES_PER_GNB + 1, UE_info->connected_ue_list, rnti);
NR_SCHED_UNLOCK(&UE_info->mutex); NR_SCHED_UNLOCK(&UE_info->mutex);
if (UE)
delete_nr_ue_data(UE, nr_mac->common_channels, &UE_info->uid_allocator); delete_nr_ue_data(UE, nr_mac->common_channels, &UE_info->uid_allocator);
else
nr_release_ra_UE(nr_mac, rnti);
} }
// all values passed to this function are in dB x10 // all values passed to this function are in dB x10