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
canghaiwuhen
OpenXG-RAN
Commits
d9b0b812
Commit
d9b0b812
authored
Mar 01, 2019
by
wujing
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_nfapi_rm2173' into develop
parents
25c9f496
d02f4a0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+1
-1
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
+8
-0
No files found.
openair2/RRC/LTE/rrc_eNB.c
View file @
d9b0b812
...
...
@@ -7412,7 +7412,7 @@ rrc_rx_tx(
((
ue_to_be_removed
->
ue_context
.
ue_rrc_inactivity_timer
>=
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
rrc_inactivity_timer_thres
)
&&
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
configuration
.
rrc_inactivity_timer_thres
>
0
)))
{
ue_to_be_removed
->
ue_context
.
ue_release_timer_s1
=
1
;
ue_to_be_removed
->
ue_context
.
ue_release_timer_thres_s1
=
1
00
;
ue_to_be_removed
->
ue_context
.
ue_release_timer_thres_s1
=
2
00
;
ue_to_be_removed
->
ue_context
.
ue_release_timer
=
0
;
ue_to_be_removed
->
ue_context
.
ue_reestablishment_timer
=
0
;
}
...
...
openair2/RRC/LTE/rrc_eNB_S1AP.c
View file @
d9b0b812
...
...
@@ -260,6 +260,14 @@ rrc_eNB_S1AP_get_ue_ids(
}
if
(
ue_desc_p
!=
NULL
)
{
struct
s1ap_eNB_ue_context_s
*
s1ap_ue_context_p
=
NULL
;
if
((
s1ap_ue_context_p
=
RB_REMOVE
(
s1ap_ue_map
,
&
s1ap_eNB_instance_p
->
s1ap_ue_head
,
ue_desc_p
))
!=
NULL
)
{
LOG_E
(
RRC
,
"Removed UE context eNB_ue_s1ap_id %u
\n
"
,
s1ap_ue_context_p
->
eNB_ue_s1ap_id
);
s1ap_eNB_free_ue_context
(
s1ap_ue_context_p
);
}
else
{
LOG_E
(
RRC
,
"Removing UE context eNB_ue_s1ap_id %u: did not find context
\n
"
,
ue_desc_p
->
eNB_ue_s1ap_id
);
}
return
NULL
;
//skip the operation below to avoid loop
result
=
rrc_eNB_S1AP_get_ue_ids
(
rrc_instance_pP
,
ue_desc_p
->
ue_initial_id
,
eNB_ue_s1ap_id
);
if
(
result
!=
NULL
)
{
...
...
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