mirror of https://github.com/PentHertz/srsLTE.git
Merge branch 'issue_incorrect_dci' into raa_new
This commit is contained in:
parent
f3f4528a2f
commit
cac027d695
|
@ -280,7 +280,10 @@ private:
|
|||
memcpy(&cur_grant, &grant, sizeof(Tgrant));
|
||||
|
||||
if (payload_buffer_ptr) {
|
||||
Warning("DL PID %d: Allocating buffer already allocated\n", pid);
|
||||
Warning("DL PID %d: Allocating buffer already allocated. Deallocating.\n", pid);
|
||||
if (pid != HARQ_BCCH_PID) {
|
||||
harq_entity->demux_unit->deallocate(payload_buffer_ptr);
|
||||
}
|
||||
}
|
||||
|
||||
// Instruct the PHY To combine the received data and attempt to decode it
|
||||
|
@ -327,11 +330,13 @@ private:
|
|||
}
|
||||
}
|
||||
|
||||
if (!action->decode_enabled[tid]) {
|
||||
pthread_mutex_unlock(&mutex);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void tb_decoded(bool ack_) {
|
||||
pthread_mutex_lock(&mutex);
|
||||
ack = ack_;
|
||||
if (ack) {
|
||||
if (pid == HARQ_BCCH_PID) {
|
||||
|
|
Loading…
Reference in New Issue