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

merge conflict fix

Browse Source
This commit is contained in:
laurent
2022-09-02 11:36:47 +02:00
parent 5fcd8b6f9f
commit 9b207834e7
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+1 -5
View File
@@ -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;