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
wangjie
OpenXG-RAN
Commits
9b2081e1
Commit
9b2081e1
authored
Jul 06, 2020
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: compilation.
parent
17c36d0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
21 deletions
+12
-21
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-0
openair3/S1AP/s1ap_eNB.c
openair3/S1AP/s1ap_eNB.c
+11
-10
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+0
-11
No files found.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
9b2081e1
...
@@ -2603,6 +2603,7 @@ add_new_ue(module_id_t mod_idP,
...
@@ -2603,6 +2603,7 @@ add_new_ue(module_id_t mod_idP,
)
)
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
{
{
eNB_MAC_INST
*
eNB
=
RC
.
mac
[
mod_idP
];
int
UE_id
;
int
UE_id
;
int
i
,
j
;
int
i
,
j
;
UE_list_t
*
UE_list
=
&
RC
.
mac
[
mod_idP
]
->
UE_list
;
UE_list_t
*
UE_list
=
&
RC
.
mac
[
mod_idP
]
->
UE_list
;
...
...
openair3/S1AP/s1ap_eNB.c
View file @
9b2081e1
...
@@ -429,16 +429,17 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
...
@@ -429,16 +429,17 @@ void s1ap_eNB_handle_sctp_association_resp(instance_t instance, sctp_new_associa
// }
// }
else
else
{
{
/* Update parameters */
/* Update parameters */
s1ap_mme_data_p
->
assoc_id
=
sctp_new_association_resp
->
assoc_id
;
s1ap_mme_data_p
->
assoc_id
=
sctp_new_association_resp
->
assoc_id
;
s1ap_mme_data_p
->
in_streams
=
sctp_new_association_resp
->
in_streams
;
s1ap_mme_data_p
->
in_streams
=
sctp_new_association_resp
->
in_streams
;
s1ap_mme_data_p
->
out_streams
=
sctp_new_association_resp
->
out_streams
;
s1ap_mme_data_p
->
out_streams
=
sctp_new_association_resp
->
out_streams
;
/* Prepare new S1 Setup Request */
/* Prepare new S1 Setup Request */
s1ap_mme_data_p
->
s1_setupreq_cnt
=
0
;
s1ap_mme_data_p
->
s1_setupreq_cnt
=
0
;
s1ap_mme_data_p
->
sctp_req_cnt
=
0
;
s1ap_mme_data_p
->
sctp_req_cnt
=
0
;
if
(
s1ap_eNB_generate_s1_setup_request
(
instance_p
,
s1ap_mme_data_p
)
==
-
1
)
{
if
(
s1ap_eNB_generate_s1_setup_request
(
instance_p
,
s1ap_mme_data_p
)
==
-
1
)
{
S1AP_ERROR
(
"s1ap eNB generate s1 setup request failed
\n
"
);
S1AP_ERROR
(
"s1ap eNB generate s1 setup request failed
\n
"
);
return
;
return
;
}
}
}
}
}
...
...
targets/RT/USER/lte-enb.c
View file @
9b2081e1
...
@@ -1547,17 +1547,6 @@ void *pre_scd_task( void *param ) {
...
@@ -1547,17 +1547,6 @@ void *pre_scd_task( void *param ) {
eNB
=
RC
.
mac
[
Mod_id
];
eNB
=
RC
.
mac
[
Mod_id
];
UE_list
=
&
eNB
->
UE_list
;
UE_list
=
&
eNB
->
UE_list
;
if
(
g_dact_collection
)
{
uint32_t
meas_ret
;
meas_ret
=
fjt_meas_ringbuff_create
(
PRE_THREAD_FLAG
);
if
(
meas_ret
==
FJT_MEAS_RET_FATAL
)
{
LOG_E
(
GTPU
,
"fjt_meas_ringbuff_create NG in pre_scd_thread.[ret=%u]"
,
meas_ret
);
oai_exit
=
1
;
return
0
;
}
}
while
(
!
oai_exit
)
{
while
(
!
oai_exit
)
{
if
(
oai_exit
)
{
if
(
oai_exit
)
{
...
...
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