mirror of https://github.com/PentHertz/srsLTE.git
fix conflicts after merging
This commit is contained in:
parent
3f38165827
commit
291d80119c
|
@ -197,9 +197,6 @@ public:
|
||||||
void set_log(srslte::log *log) {
|
void set_log(srslte::log *log) {
|
||||||
this->log = log;
|
this->log = log;
|
||||||
}
|
}
|
||||||
void set_log(srslte::log *log) {
|
|
||||||
this->log = log;
|
|
||||||
}
|
|
||||||
void deallocate(byte_buffer_t *b) {
|
void deallocate(byte_buffer_t *b) {
|
||||||
if(!b) {
|
if(!b) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -44,16 +44,7 @@ rlc_um::rlc_um(uint32_t queue_len)
|
||||||
// Warning: must call stop() to properly deallocate all buffers
|
// Warning: must call stop() to properly deallocate all buffers
|
||||||
rlc_um::~rlc_um()
|
rlc_um::~rlc_um()
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
pthread_mutex_destroy(&mutex);
|
|
||||||
pool = NULL;
|
|
||||||
if (mac_timers && reordering_timer) {
|
|
||||||
mac_timers->timer_release_id(reordering_timer_id);
|
|
||||||
reordering_timer = NULL;
|
|
||||||
}
|
|
||||||
=======
|
|
||||||
stop();
|
stop();
|
||||||
>>>>>>> 1f7e9187906c824b2092c71374291042e571d631
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void rlc_um::init(srslte::log *log_,
|
void rlc_um::init(srslte::log *log_,
|
||||||
|
|
Loading…
Reference in New Issue