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
dbc47596
Commit
dbc47596
authored
Jan 16, 2024
by
Chieh-Chun Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: enable association to multiple slices for one UE in RC RAN func
parent
3317f276
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
23 deletions
+15
-23
openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
+15
-23
No files found.
openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
View file @
dbc47596
...
@@ -444,21 +444,11 @@ static bool add_mod_rc_slice(int mod_id, size_t slices_len, ran_param_list_t* ls
...
@@ -444,21 +444,11 @@ static bool add_mod_rc_slice(int mod_id, size_t slices_len, ran_param_list_t* ls
UE_iterator
(
UE_info
->
list
,
UE
)
{
UE_iterator
(
UE_info
->
list
,
UE
)
{
rnti_t
rnti
=
UE
->
rnti
;
rnti_t
rnti
=
UE
->
rnti
;
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE
->
UE_sched_ctrl
;
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE
->
UE_sched_ctrl
;
bool
matched_ue
=
0
;
long
lcid
=
0
;
long
lcid
=
0
;
for
(
int
l
=
0
;
l
<
sched_ctrl
->
dl_lc_num
;
++
l
)
{
for
(
int
l
=
0
;
l
<
sched_ctrl
->
dl_lc_num
;
++
l
)
{
lcid
=
sched_ctrl
->
dl_lc_ids
[
l
];
lcid
=
sched_ctrl
->
dl_lc_ids
[
l
];
LOG_D
(
NR_MAC
,
"l %d, lcid %ld, sst %d, sd %d
\n
"
,
l
,
lcid
,
sched_ctrl
->
dl_lc_nssai
[
lcid
].
sst
,
sched_ctrl
->
dl_lc_nssai
[
lcid
].
sd
);
LOG_D
(
NR_MAC
,
"l %d, lcid %ld, sst %d, sd %d
\n
"
,
l
,
lcid
,
sched_ctrl
->
dl_lc_nssai
[
lcid
].
sst
,
sched_ctrl
->
dl_lc_nssai
[
lcid
].
sd
);
if
(
nssai_matches
(
sched_ctrl
->
dl_lc_nssai
[
lcid
],
RC_sst
,
&
RC_sd
))
{
if
(
nssai_matches
(
sched_ctrl
->
dl_lc_nssai
[
lcid
],
RC_sst
,
&
RC_sd
))
{
matched_ue
=
1
;
// assume UE only associates to one slice
break
;
}
}
if
(
!
matched_ue
)
continue
;
// TODO: need to fix nssai info in RRCSetupComplete
rrc_gNB_ue_context_t
*
rrc_ue_context_list
=
rrc_gNB_get_ue_context_by_rnti_any_du
(
RC
.
nrrrc
[
mod_id
],
rnti
);
rrc_gNB_ue_context_t
*
rrc_ue_context_list
=
rrc_gNB_get_ue_context_by_rnti_any_du
(
RC
.
nrrrc
[
mod_id
],
rnti
);
uint16_t
UE_mcc
=
rrc_ue_context_list
->
ue_context
.
ue_guami
.
mcc
;
uint16_t
UE_mcc
=
rrc_ue_context_list
->
ue_context
.
ue_guami
.
mcc
;
uint16_t
UE_mnc
=
rrc_ue_context_list
->
ue_context
.
ue_guami
.
mnc
;
uint16_t
UE_mnc
=
rrc_ue_context_list
->
ue_context
.
ue_guami
.
mnc
;
...
@@ -475,6 +465,8 @@ static bool add_mod_rc_slice(int mod_id, size_t slices_len, ran_param_list_t* ls
...
@@ -475,6 +465,8 @@ static bool add_mod_rc_slice(int mod_id, size_t slices_len, ran_param_list_t* ls
RC_mcc
,
RC_mnc
,
RC_sst
,
RC_sd
,
UE_mcc
,
UE_mnc
,
UE_sst
,
UE_sd
);
RC_mcc
,
RC_mnc
,
RC_sst
,
RC_sd
,
UE_mcc
,
UE_mnc
,
UE_sst
,
UE_sd
);
}
}
}
}
}
}
}
}
...
...
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