From 5f1fe21c7c44ee5fd73d9ae3691d7a3230f105d9 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Thu, 15 Oct 2020 08:54:31 +0200
Subject: [PATCH] Revert "Fix to avoid RRC->X2AP ticking every msec when x2ap
task is not enabled"
This reverts commit 1a5874d40f506724babec223537b086e4efc4596.
---
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index 58bc12297c1..58de000ac5e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -58,7 +58,6 @@
#include "intertask_interface.h"
#include "executables/softmodem-common.h"
-#include "x2ap_eNB.h"
const uint8_t slots_per_frame[5] = {10, 20, 40, 80, 160};
uint16_t nr_pdcch_order_table[6] = { 31, 31, 511, 2047, 2047, 8191 };
@@ -433,8 +432,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
if ((slot & ((1 << *scc->ssbSubcarrierSpacing) - 1)) == 0) {
void nr_rlc_tick(int frame, int subframe);
nr_rlc_tick(frame, slot >> *scc->ssbSubcarrierSpacing);
- if (is_x2ap_enabled())
- nr_rrc_trigger(&ctxt, 0 /*CC_id*/, frame, slot >> *scc->ssbSubcarrierSpacing);
+ nr_rrc_trigger(&ctxt, 0 /*CC_id*/, frame, slot >> *scc->ssbSubcarrierSpacing);
}
const uint64_t dlsch_in_slot_bitmap = (1 << 1);
--
GitLab