From 5634aa92a1a8549e697d77d781cc2d1fdc9099bc Mon Sep 17 00:00:00 2001
From: Navid Nikaein <navid.nikaein@eurecom.fr>
Date: Mon, 12 Mar 2018 16:39:00 +0100
Subject: [PATCH] Keep the LCID priority in MAC layer to sort the UE
accordingly
---
openair2/LAYER2/MAC/config.c | 17 +++++++++++------
openair2/LAYER2/MAC/mac.h | 3 +++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c
index 8fd85e7811..a7bf532b09 100644
--- a/openair2/LAYER2/MAC/config.c
+++ b/openair2/LAYER2/MAC/config.c
@@ -852,16 +852,21 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
LOG_E(MAC, "%s:%d:%s: ERROR, UE_id == -1\n", __FILE__,
__LINE__, __FUNCTION__);
} else {
- if (logicalChannelConfig)
+ if (logicalChannelConfig) {
UE_list->
UE_template[CC_idP][UE_id].lcgidmap
[logicalChannelIdentity] =
*logicalChannelConfig->
- ul_SpecificParameters->logicalChannelGroup;
- else
- UE_list->
- UE_template[CC_idP][UE_id].lcgidmap
- [logicalChannelIdentity] = 0;
+ ul_SpecificParameters->logicalChannelGroup;
+ UE_list->
+ UE_template[CC_idP][UE_id].lcgidpriority
+ [logicalChannelIdentity]=
+ logicalChannelConfig->ul_SpecificParameters->priority;
+
+ } else
+ UE_list->
+ UE_template[CC_idP][UE_id].lcgidmap
+ [logicalChannelIdentity] = 0;
}
}
diff --git a/openair2/LAYER2/MAC/mac.h b/openair2/LAYER2/MAC/mac.h
index 7bc73e11b9..8fa2e3bdc9 100644
--- a/openair2/LAYER2/MAC/mac.h
+++ b/openair2/LAYER2/MAC/mac.h
@@ -849,6 +849,9 @@ typedef struct {
/// LCGID mapping
long lcgidmap[11];
+ ///UE logical channel priority
+ long lcgidpriority[11];
+
/// phr information
int8_t phr_info;
--
2.26.2