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
c37a4026
Commit
c37a4026
authored
Jun 10, 2020
by
Ding Yumei
Committed by
Haruki NAOI
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix RM3740:e-rab release issue
(cherry picked from commit 7138f92b0b153bb94a821b9cdc06ed4908a35e5a)
parent
6e78a9f8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+3
-0
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
+1
-0
No files found.
openair2/RRC/LTE/rrc_eNB.c
View file @
c37a4026
...
@@ -8607,6 +8607,7 @@ rrc_eNB_decode_dcch(
...
@@ -8607,6 +8607,7 @@ rrc_eNB_decode_dcch(
ue_context_p
->
ue_context
.
reestablishment_cause
=
LTE_ReestablishmentCause_spare1
;
ue_context_p
->
ue_context
.
reestablishment_cause
=
LTE_ReestablishmentCause_spare1
;
for
(
uint8_t
e_rab
=
0
;
e_rab
<
ue_context_p
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
for
(
uint8_t
e_rab
=
0
;
e_rab
<
ue_context_p
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
xid
=
-
1
;
if
(
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
if
(
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
=
E_RAB_STATUS_ESTABLISHED
;
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
=
E_RAB_STATUS_ESTABLISHED
;
}
else
{
}
else
{
...
@@ -8616,6 +8617,7 @@ rrc_eNB_decode_dcch(
...
@@ -8616,6 +8617,7 @@ rrc_eNB_decode_dcch(
}
}
}
else
if
(
dedicated_DRB
==
2
)
{
}
else
if
(
dedicated_DRB
==
2
)
{
for
(
uint8_t
e_rab
=
0
;
e_rab
<
ue_context_p
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
for
(
uint8_t
e_rab
=
0
;
e_rab
<
ue_context_p
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
xid
=
-
1
;
if
(
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
if
(
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
=
E_RAB_STATUS_ESTABLISHED
;
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
=
E_RAB_STATUS_ESTABLISHED
;
}
else
{
}
else
{
...
@@ -8624,6 +8626,7 @@ rrc_eNB_decode_dcch(
...
@@ -8624,6 +8626,7 @@ rrc_eNB_decode_dcch(
}
}
}
else
if
(
dedicated_DRB
==
3
)
{
//x2 path switch
}
else
if
(
dedicated_DRB
==
3
)
{
//x2 path switch
for
(
uint8_t
e_rab
=
0
;
e_rab
<
ue_context_p
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
for
(
uint8_t
e_rab
=
0
;
e_rab
<
ue_context_p
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
xid
=
-
1
;
if
(
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
if
(
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
=
E_RAB_STATUS_ESTABLISHED
;
ue_context_p
->
ue_context
.
e_rab
[
e_rab
].
status
=
E_RAB_STATUS_ESTABLISHED
;
}
else
{
}
else
{
...
...
openair2/RRC/LTE/rrc_eNB_S1AP.c
View file @
c37a4026
...
@@ -598,6 +598,7 @@ rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(
...
@@ -598,6 +598,7 @@ rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(
S1AP_INITIAL_CONTEXT_SETUP_RESP
(
msg_p
).
eNB_ue_s1ap_id
=
ue_context_pP
->
ue_context
.
eNB_ue_s1ap_id
;
S1AP_INITIAL_CONTEXT_SETUP_RESP
(
msg_p
).
eNB_ue_s1ap_id
=
ue_context_pP
->
ue_context
.
eNB_ue_s1ap_id
;
for
(
e_rab
=
0
;
e_rab
<
ue_context_pP
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
for
(
e_rab
=
0
;
e_rab
<
ue_context_pP
->
ue_context
.
nb_of_e_rabs
;
e_rab
++
)
{
ue_context_pP
->
ue_context
.
e_rab
[
e_rab
].
xid
=
-
1
;
if
(
ue_context_pP
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
if
(
ue_context_pP
->
ue_context
.
e_rab
[
e_rab
].
status
==
E_RAB_STATUS_DONE
)
{
e_rabs_done
++
;
e_rabs_done
++
;
S1AP_INITIAL_CONTEXT_SETUP_RESP
(
msg_p
).
e_rabs
[
e_rab
].
e_rab_id
=
ue_context_pP
->
ue_context
.
e_rab
[
e_rab
].
param
.
e_rab_id
;
S1AP_INITIAL_CONTEXT_SETUP_RESP
(
msg_p
).
e_rabs
[
e_rab
].
e_rab_id
=
ue_context_pP
->
ue_context
.
e_rab
[
e_rab
].
param
.
e_rab_id
;
...
...
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