Skip to content

O
OpenXG-RAN
Commit 9b207834 authored by laurent's avatar laurent
Browse files
Options

merge conflict fix

parent 5fcd8b6f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
View file @ 9b207834
...@@ -591,13 +591,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue, ...@@ -591,13 +591,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
} }
for (r=0; r<nbDecode; r++) { for (r=0; r<nbDecode; r++) {
<<<<<<< HEAD notifiedFIFO_elt_t *req=pullTpool(&nf, &get_nrUE_params()->Tpool);
notifiedFIFO_elt_t *req=pullTpool(&nf, &(pool_dl));
if (req == NULL) if (req == NULL)
break; // Tpool has been stopped break; // Tpool has been stopped
=======
notifiedFIFO_elt_t *req=pullTpool(&nf, &get_nrUE_params()->Tpool);
>>>>>>> e9caae6f99 (simplify thread pool configuration)
bool last = false; bool last = false;
if (r == nbDecode - 1) if (r == nbDecode - 1)
last = true; last = true;
......
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