Skip to content

O
OpenXG-RAN
Commit 363b4021 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

fixup of fix

parent 170ee6ba
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @ 363b4021
...@@ -457,6 +457,9 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP, ...@@ -457,6 +457,9 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
* it. */ * it. */
for (int i = 0; i < NR_NB_RA_PROC_MAX; ++i) { for (int i = 0; i < NR_NB_RA_PROC_MAX; ++i) {
NR_RA_t *ra = &gNB_mac->common_channels[CC_idP].ra[i]; NR_RA_t *ra = &gNB_mac->common_channels[CC_idP].ra[i];
if (ra->state != WAIT_Msg3)
continue;
// random access pusch with TC-RNTI // random access pusch with TC-RNTI
if (ra->rnti != current_rnti) { if (ra->rnti != current_rnti) {
LOG_W(MAC, LOG_W(MAC,
...@@ -466,8 +469,8 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP, ...@@ -466,8 +469,8 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
continue; continue;
} }
if (ra->state == WAIT_Msg3 && !sduP) { if (!sduP) {
LOG_E(MAC, LOG_w(MAC,
"%4d.%2d did not receive Msg 3 for RA RNTI %04x, resetting to State RA_IDLE\n", "%4d.%2d did not receive Msg 3 for RA RNTI %04x, resetting to State RA_IDLE\n",
frameP, frameP,
slotP, slotP,
...@@ -476,9 +479,6 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP, ...@@ -476,9 +479,6 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
continue; continue;
} }
if (ra->state != WAIT_Msg3)
continue;
const int UE_id = add_new_nr_ue(gnb_mod_idP, ra->rnti, ra->secondaryCellGroup); const int UE_id = add_new_nr_ue(gnb_mod_idP, ra->rnti, ra->secondaryCellGroup);
UE_info->UE_beam_index[UE_id] = ra->beam_id; UE_info->UE_beam_index[UE_id] = ra->beam_id;
LOG_I(MAC, LOG_I(MAC,
......
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