Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
98bb3e88
Commit
98bb3e88
authored
Sep 08, 2023
by
Stone WU
Committed by
Vadym Furmanchuk
Sep 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #128027:[eNB][RA]allocate different rnti for UE if SS configured temp rnti exist
parent
4e4829de
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+7
-1
openair3/SS/ss_eNB_drb_task.c
openair3/SS/ss_eNB_drb_task.c
+0
-1
openair3/SS/ss_eNB_srb_task.c
openair3/SS/ss_eNB_srb_task.c
+1
-2
openair3/SS/ss_eNB_sys_task.c
openair3/SS/ss_eNB_sys_task.c
+1
-1
No files found.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
98bb3e88
...
@@ -1424,7 +1424,13 @@ initiate_ra_proc(module_id_t module_idP,
...
@@ -1424,7 +1424,13 @@ initiate_ra_proc(module_id_t module_idP,
ra
[
i
].
rnti
=
drnti
[
nb_ue
];
ra
[
i
].
rnti
=
drnti
[
nb_ue
];
}
else
if
((
RC
.
ss
.
mode
>
SS_ENB
)
&&
RC
.
ss
.
ss_crnti
[
CC_id
].
b_Temp_RNTI_Present
)
{
}
else
if
((
RC
.
ss
.
mode
>
SS_ENB
)
&&
RC
.
ss
.
ss_crnti
[
CC_id
].
b_Temp_RNTI_Present
)
{
// SS_MODE configured setup the CRNTI from the Cell_config
// SS_MODE configured setup the CRNTI from the Cell_config
ra
[
i
].
rnti
=
RC
.
ss
.
ss_crnti
[
CC_id
].
Temp_C_RNTI
;
/* Since the configured Temp_C_RNTI always be same, it would cause many UE mac context conflict after when no UE release(rrcRelease) on eNB side.
Here we generate different RNTI if the UE with rnti already exist */
uint16_t
new_rnti
=
RC
.
ss
.
ss_crnti
[
CC_id
].
Temp_C_RNTI
;
while
(
-
1
!=
find_UE_id
(
module_idP
,
new_rnti
)){
new_rnti
+=
1
;
}
ra
[
i
].
rnti
=
new_rnti
;
break
;
break
;
}
else
{
}
else
{
ra
[
i
].
rnti
=
taus
();
ra
[
i
].
rnti
=
taus
();
...
...
openair3/SS/ss_eNB_drb_task.c
View file @
98bb3e88
...
@@ -54,7 +54,6 @@
...
@@ -54,7 +54,6 @@
#include "ss_eNB_vt_timer_task.h"
#include "ss_eNB_vt_timer_task.h"
extern
RAN_CONTEXT_t
RC
;
extern
RAN_CONTEXT_t
RC
;
//extern uint16_t ss_rnti_g;
static
acpCtx_t
ctx_drb_g
=
NULL
;
static
acpCtx_t
ctx_drb_g
=
NULL
;
extern
SSConfigContext_t
SS_context
;
extern
SSConfigContext_t
SS_context
;
...
...
openair3/SS/ss_eNB_srb_task.c
View file @
98bb3e88
...
@@ -63,7 +63,6 @@ SSConfigContext_t SS_context;
...
@@ -63,7 +63,6 @@ SSConfigContext_t SS_context;
static
acpCtx_t
ctx_srb_g
=
NULL
;
static
acpCtx_t
ctx_srb_g
=
NULL
;
static
uint16_t
rnti_g
=
0
;
static
uint16_t
rnti_g
=
0
;
static
instance_t
instance_g
=
0
;
static
instance_t
instance_g
=
0
;
//uint16_t ss_rnti_g = 0;
enum
MsgUserId
enum
MsgUserId
{
{
...
@@ -105,7 +104,7 @@ static void ss_send_srb_data(ss_rrc_pdu_ind_t *pdu_ind,int cell_index)
...
@@ -105,7 +104,7 @@ static void ss_send_srb_data(ss_rrc_pdu_ind_t *pdu_ind,int cell_index)
DevAssert
(
pdu_ind
->
sdu_size
>=
0
);
DevAssert
(
pdu_ind
->
sdu_size
>=
0
);
DevAssert
(
pdu_ind
->
srb_id
>=
0
);
DevAssert
(
pdu_ind
->
srb_id
>=
0
);
rnti_g
=
pdu_ind
->
rnti
;
rnti_g
=
pdu_ind
->
rnti
;
SS_context
.
SSCell_list
[
cell_index
].
ss_rnti_g
=
rnti_g
;
SS_context
.
SSCell_list
[
cell_index
].
ss_rnti_g
=
rnti_g
;
/* Always update UE rnti with latest actual rnti */
size_t
msgSize
=
size
;
size_t
msgSize
=
size
;
memset
(
&
ind
,
0
,
sizeof
(
ind
));
memset
(
&
ind
,
0
,
sizeof
(
ind
));
ind
.
Common
.
CellId
=
SS_context
.
SSCell_list
[
cell_index
].
eutra_cellId
;
ind
.
Common
.
CellId
=
SS_context
.
SSCell_list
[
cell_index
].
eutra_cellId
;
...
...
openair3/SS/ss_eNB_sys_task.c
View file @
98bb3e88
...
@@ -775,7 +775,7 @@ int sys_add_reconfig_cell(struct SYSTEM_CTRL_REQ *req)
...
@@ -775,7 +775,7 @@ int sys_add_reconfig_cell(struct SYSTEM_CTRL_REQ *req)
{
{
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
b_C_RNTI_Present
=
true
;
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
b_C_RNTI_Present
=
true
;
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
C_RNTI
=
bin_to_int
(
AddOrReconfigure
->
Active
.
v
.
C_RNTI
.
v
,
16
);
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
C_RNTI
=
bin_to_int
(
AddOrReconfigure
->
Active
.
v
.
C_RNTI
.
v
,
16
);
SS_context
.
SSCell_list
[
cell_index
].
ss_rnti_g
=
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
C_RNTI
;
//
SS_context.SSCell_list[cell_index].ss_rnti_g = RRC_CONFIGURATION_REQ(msg_p).ActiveParam[cell_index].C_RNTI;
LOG_A
(
ENB_SS_SYS_TASK
,
"C_RNTI present in Active Cell Config %d
\n
"
,
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
C_RNTI
);
LOG_A
(
ENB_SS_SYS_TASK
,
"C_RNTI present in Active Cell Config %d
\n
"
,
RRC_CONFIGURATION_REQ
(
msg_p
).
ActiveParam
[
cell_index
].
C_RNTI
);
}
}
if
(
AddOrReconfigure
->
Active
.
v
.
RachProcedureConfig
.
d
==
true
)
if
(
AddOrReconfigure
->
Active
.
v
.
RachProcedureConfig
.
d
==
true
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment