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

Merge remote-tracking branch 'origin/fix-itti-segv' into integration_2020_wk48

Browse Source
This commit is contained in:
hardy
2020-11-19 14:59:39 +01:00
parent e097bec73e a592d0eb6f
commit 4c3ee5f0e0
4 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
-1
View File
@@ -421,7 +421,6 @@ void nr_initiate_ra_proc(module_id_t module_idP,
uint8_t ul_carrier_id = 0; // 0 for NUL 1 for SUL
NR_SearchSpace_t *ss;
int UE_id = 0;
uint16_t msg2_frame, msg2_slot,monitoring_slot_period,monitoring_offset;
gNB_MAC_INST *nr_mac = RC.nrmac[module_idP];
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+2 -2
View File
@@ -1692,7 +1692,7 @@ inline void add_nr_ue_list(NR_UE_list_t *listP, int UE_id) {
/*
* Remove a UE from NR_UE_list listP
*/
inline int remove_nr_ue_list(NR_UE_list_t *listP, int UE_id) {
static inline void remove_nr_ue_list(NR_UE_list_t *listP, int UE_id) {
int *cur = &listP->head;
while (*cur != -1 && *cur != UE_id)
cur = &listP->next[*cur];
@@ -1700,7 +1700,7 @@ inline int remove_nr_ue_list(NR_UE_list_t *listP, int UE_id) {
int *next = &listP->next[*cur];
*cur = listP->next[*cur];
*next = -1;
return 1;
return;
}
int find_nr_UE_id(module_id_t mod_idP, rnti_t rntiP)