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
zzha zzha
OpenXG-RAN
Commits
c3f19a4e
Commit
c3f19a4e
authored
1 year ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move "UM on default DRB" param to RRC config, make it bool
parent
d58ebfca
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
5 deletions
+4
-5
openair2/COMMON/rrc_messages_types.h
openair2/COMMON/rrc_messages_types.h
+1
-0
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-1
openair2/GNB_APP/gnb_paramdef.h
openair2/GNB_APP/gnb_paramdef.h
+1
-1
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_defs.h
+0
-2
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-1
No files found.
openair2/COMMON/rrc_messages_types.h
View file @
c3f19a4e
...
...
@@ -409,6 +409,7 @@ typedef struct NRRrcConfigurationReq_s {
uint8_t
mnc_digit_length
[
PLMN_LIST_MAX_SIZE
];
uint8_t
num_plmn
;
bool
um_on_default_drb
;
bool
enable_sdap
;
int
drbs
;
}
gNB_RrcConfigurationReq
;
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
c3f19a4e
...
...
@@ -1541,7 +1541,6 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
rrc
->
nr_cellid
=
(
uint64_t
)
*
(
GNBParamList
.
paramarray
[
i
][
GNB_NRCELLID_IDX
].
u64ptr
);
rrc
->
um_on_default_drb
=
*
(
GNBParamList
.
paramarray
[
i
][
GNB_UMONDEFAULTDRB_IDX
].
uptr
);
if
(
strcmp
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"local_mac"
)
==
0
)
{
}
else
if
(
strcmp
(
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"cudu"
)
==
0
)
{
...
...
@@ -1605,6 +1604,7 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
nrrrc_config
.
enable_sdap
=
*
GNBParamList
.
paramarray
[
i
][
GNB_ENABLE_SDAP_IDX
].
iptr
;
LOG_I
(
GNB_APP
,
"SDAP layer is %s
\n
"
,
nrrrc_config
.
enable_sdap
?
"enabled"
:
"disabled"
);
nrrrc_config
.
drbs
=
*
GNBParamList
.
paramarray
[
i
][
GNB_DRBS
].
iptr
;
nrrrc_config
.
um_on_default_drb
=
*
(
GNBParamList
.
paramarray
[
i
][
GNB_UMONDEFAULTDRB_IDX
].
uptr
);
LOG_I
(
GNB_APP
,
"Data Radio Bearer count %d
\n
"
,
nrrrc_config
.
drbs
);
}
//
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_paramdef.h
View file @
c3f19a4e
...
...
@@ -161,7 +161,7 @@ typedef enum {
{GNB_CONFIG_STRING_NRCELLID, NULL, 0, .u64ptr=NULL,.defint64val=1, TYPE_UINT64, 0}, \
{GNB_CONFIG_STRING_MINRXTXTIME, NULL, 0, .iptr=NULL, .defintval=2, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_ULPRBBLACKLIST, NULL, 0, .strptr=NULL,.defstrval="", TYPE_STRING, 0}, \
{GNB_CONFIG_STRING_UMONDEFAULTDRB, NULL,
0,
.uptr=NULL, .defuintval=0, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_UMONDEFAULTDRB, NULL,
PARAMFLAG_BOOL,
.uptr=NULL, .defuintval=0, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_FORCE256QAMOFF, GNB_CONFIG_HLP_FORCE256QAMOFF, PARAMFLAG_BOOL, .iptr=NULL, .defintval=0, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_ENABLE_SDAP, GNB_CONFIG_HLP_STRING_ENABLE_SDAP, PARAMFLAG_BOOL,.iptr=NULL, .defintval=0, TYPE_INT, 0}, \
{GNB_CONFIG_STRING_DRBS, GNB_CONFIG_HLP_STRING_DRBS, 0, .iptr=NULL, .defintval=1, TYPE_INT, 0}, \
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/nr_rrc_defs.h
View file @
c3f19a4e
...
...
@@ -391,8 +391,6 @@ typedef struct gNB_RRC_INST_s {
// gNB N3 GTPU instance
instance_t
e1_inst
;
int
um_on_default_drb
;
char
*
uecap_file
;
// security configuration (preferred algorithms)
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
c3f19a4e
...
...
@@ -2352,7 +2352,7 @@ void prepare_and_send_ue_context_modification_f1(rrc_gNB_ue_context_t *ue_contex
f1ap_drb_to_be_setup_t
drbs
[
nb_drb
];
for
(
int
i
=
0
;
i
<
nb_drb
;
i
++
)
{
drbs
[
i
].
drb_id
=
e1ap_resp
->
pduSession
[
0
].
DRBnGRanList
[
i
].
id
;
drbs
[
i
].
rlc_mode
=
rrc
->
um_on_default_drb
?
RLC_MODE_UM
:
RLC_MODE_AM
;
drbs
[
i
].
rlc_mode
=
rrc
->
configuration
.
um_on_default_drb
?
RLC_MODE_UM
:
RLC_MODE_AM
;
drbs
[
i
].
up_ul_tnl
[
0
].
tl_address
=
e1ap_resp
->
pduSession
[
0
].
DRBnGRanList
[
i
].
UpParamList
[
0
].
tlAddress
;
drbs
[
i
].
up_ul_tnl
[
0
].
port
=
rrc
->
eth_params_s
.
my_portd
;
drbs
[
i
].
up_ul_tnl
[
0
].
teid
=
e1ap_resp
->
pduSession
[
0
].
DRBnGRanList
[
i
].
UpParamList
[
0
].
teId
;
...
...
This diff is collapsed.
Click to expand it.
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