Skip to content

O
OpenXG-RAN
Commit 1ca91b3c authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen
Browse files
Options

fix bug for PC5S release

parent 02fd6fbd
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
openair2/LAYER2/MAC/config.c
View file @ 1ca91b3c
...@@ -1473,8 +1473,8 @@ rrc_mac_config_req_ue( ...@@ -1473,8 +1473,8 @@ rrc_mac_config_req_ue(
for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) { for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) {
if (UE_mac_inst[Mod_idP].sl_info[k].LCID == logicalChannelIdentity) { if (UE_mac_inst[Mod_idP].sl_info[k].LCID == logicalChannelIdentity) {
UE_mac_inst[Mod_idP].sl_info[k].LCID = 0; UE_mac_inst[Mod_idP].sl_info[k].LCID = 0;
UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id = 0; //UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id = 0;
UE_mac_inst[Mod_idP].sl_info[k].groupL2Id = 0; //UE_mac_inst[Mod_idP].sl_info[k].groupL2Id = 0;
UE_mac_inst[Mod_idP].numCommFlows--; UE_mac_inst[Mod_idP].numCommFlows--;
break; break;
} }
......
openair2/RRC/LITE/rrc_UE.c
View file @ 1ca91b3c
...@@ -6183,9 +6183,14 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6183,9 +6183,14 @@ void *rrc_control_socket_thread_fct(void *arg)
i = 0; i = 0;
if (destinationL2Id > 0){ if (destinationL2Id > 0){
for (i = MAX_NUM_LCID_DATA; i < MAX_NUM_LCID; i++) { for (i = MAX_NUM_LCID_DATA; i < MAX_NUM_LCID; i++) {
if ((UE_rrc_inst[module_id].sl_info[i].LCID == 0) && (j == 0)) j = i+1; if ((UE_rrc_inst[module_id].sl_info[i].LCID == 0) && (UE_rrc_inst[module_id].sl_info[i].destinationL2Id == 0) && (j == 0)) j = i+1;
if (UE_rrc_inst[module_id].sl_info[i].destinationL2Id == destinationL2Id) { if (UE_rrc_inst[module_id].sl_info[i].destinationL2Id == destinationL2Id) {
pc5s_rbid = UE_rrc_inst[module_id].sl_info[i].LCID; if (UE_rrc_inst[module_id].sl_info[i].LCID > 0) {
pc5s_rbid = UE_rrc_inst[module_id].sl_info[i].LCID;
} else if (UE_rrc_inst[module_id].sl_info[i].LCID == 0){
UE_rrc_inst[module_id].sl_info[i].LCID = i;
pc5s_rbid = UE_rrc_inst[module_id].sl_info[i].LCID;
}
LOG_I(RRC,"[PC5EstablishReq] rbid %d for destination Id: 0x%08x\n ",pc5s_rbid, UE_rrc_inst[module_id].sl_info[i].destinationL2Id ); LOG_I(RRC,"[PC5EstablishReq] rbid %d for destination Id: 0x%08x\n ",pc5s_rbid, UE_rrc_inst[module_id].sl_info[i].destinationL2Id );
break; //(LCID, D) already exists! break; //(LCID, D) already exists!
} }
...@@ -6206,7 +6211,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6206,7 +6211,7 @@ void *rrc_control_socket_thread_fct(void *arg)
j = 0; j = 0;
i = 0; i = 0;
for (i = MAX_NUM_LCID_DATA; i < MAX_NUM_LCID; i++) { for (i = MAX_NUM_LCID_DATA; i < MAX_NUM_LCID; i++) {
if ((UE_rrc_inst[module_id].sl_info[i].LCID == 0) && (j == 0)) j = i+1; if ((UE_rrc_inst[module_id].sl_info[i].LCID == 0) && (UE_rrc_inst[module_id].sl_info[i].destinationL2Id == 0) && (j == 0)) j = i+1;
} }
if ((i == MAX_NUM_LCID) && (j > 0)) { if ((i == MAX_NUM_LCID) && (j > 0)) {
UE_rrc_inst[module_id].sl_info[j-1].LCID = (j-1); UE_rrc_inst[module_id].sl_info[j-1].LCID = (j-1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment