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
promise
OpenXG-RAN
Commits
8513035a
Commit
8513035a
authored
6 years ago
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix attach fail if there are 8UEs when TDD config1
parent
b5957763
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
5 deletions
+22
-5
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+5
-1
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/L2_interface.c
+7
-2
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+9
-1
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+1
-1
No files found.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
8513035a
...
...
@@ -336,7 +336,7 @@ rx_sdu(const module_id_t enb_mod_idP,
ra
=
&
mac
->
common_channels
[
CC_idP
].
ra
[
ii
];
if
((
ra
->
rnti
==
current_rnti
)
&&
(
ra
->
state
!=
IDLE
))
{
mac_rrc_data_ind
(
enb_mod_idP
,
int8_t
ret
=
mac_rrc_data_ind
(
enb_mod_idP
,
CC_idP
,
frameP
,
subframeP
,
old_rnti
,
...
...
@@ -344,6 +344,7 @@ rx_sdu(const module_id_t enb_mod_idP,
(
uint8_t
*
)
payload_ptr
,
rx_lengths
[
i
],
0
);
if
(
ret
==
0
){
// prepare transmission of Msg4(RRCConnectionReconfiguration)
ra
->
state
=
MSGCRNTI
;
LOG_I
(
MAC
,
...
...
@@ -367,6 +368,9 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
ul_SR
=
1
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
crnti_reconfigurationcomplete_flag
=
1
;
}
else
{
cancel_ra_proc
(
enb_mod_idP
,
CC_idP
,
frameP
,
current_rnti
);
}
break
;
}
}
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/L2_interface.c
View file @
8513035a
...
...
@@ -261,12 +261,17 @@ mac_rrc_data_ind(
ue_context_p
=
rrc_eNB_get_ue_context
(
RC
.
rrc
[
ctxt
.
module_id
],
rntiP
);
if
(
ue_context_p
)
{
if
(
ue_context_p
->
ue_context
.
Status
!=
RRC_RECONFIGURED
){
LOG_E
(
RRC
,
"[eNB %d] Received C-RNTI ,but UE %x status(%d) not RRC_RECONFIGURED
\n
"
,
module_idP
,
rntiP
,
ue_context_p
->
ue_context
.
Status
);
return
(
-
1
);
}
else
{
rrc_eNB_generate_defaultRRCConnectionReconfiguration
(
&
ctxt
,
ue_context_p
,
0
);
ue_context_p
->
ue_context
.
Status
=
RRC_RECONFIGURED
;
}
}
}
return
(
0
);
}
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
8513035a
...
...
@@ -5622,6 +5622,14 @@ rrc_eNB_decode_ccch(
RC
.
mac
[
ctxt_pP
->
module_id
]
->
UE_list
.
UE_sched_ctrl
[
UE_id
].
ue_reestablishment_reject_timer
=
1000
;
ue_context_p
->
ue_context
.
ue_reestablishment_timer
=
0
;
}
//c-plane not end
if
((
ue_context_p
->
ue_context
.
Status
!=
RRC_RECONFIGURED
)
&&
(
ue_context_p
->
ue_context
.
reestablishment_cause
==
LTE_ReestablishmentCause_spare1
))
{
LOG_E
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" LTE_RRCConnectionReestablishmentRequest (UE %x c-plane is not end), let's reject the UE
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
c_rnti
);
rrc_eNB_generate_RRCConnectionReestablishmentReject
(
ctxt_pP
,
ue_context_p
,
CC_id
);
break
;
}
if
(
ue_context_p
->
ue_context
.
ue_reestablishment_timer
>
0
)
{
LOG_E
(
RRC
,
...
...
@@ -6368,7 +6376,7 @@ rrc_eNB_decode_dcch(
// activate release timer, if RRCReconfComplete not received after 100 frames, remove UE
ue_context_p
->
ue_context
.
ue_reestablishment_timer
=
1
;
// remove UE after 100 frames after LTE_RRCConnectionRelease is triggered
ue_context_p
->
ue_context
.
ue_reestablishment_timer_thres
=
1000
;
ue_context_p
->
ue_context
.
ue_reestablishment_timer_thres
=
1000
0
;
break
;
case
LTE_UL_DCCH_MessageType__c1_PR_securityModeComplete
:
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-ru.c
View file @
8513035a
...
...
@@ -2270,7 +2270,7 @@ void init_RU_proc(RU_t *ru) {
pthread_setname_np
(
proc
->
pthread_FH
,
name
);
}
else
if
(
ru
->
function
==
eNodeB_3GPP
&&
ru
->
if_south
==
LOCAL_RF
)
{
// DJP - need something else to distinguish between monolithic and PNF
else
if
(
ru
->
function
==
eNodeB_3GPP
&&
ru
->
if_south
==
LOCAL_RF
&&
(
ru
->
do_prach
>
0
)
)
{
// DJP - need something else to distinguish between monolithic and PNF
LOG_I
(
PHY
,
"%s() DJP - added creation of pthread_prach
\n
"
,
__FUNCTION__
);
pthread_create
(
&
proc
->
pthread_prach
,
attr_prach
,
ru_thread_prach
,
(
void
*
)
ru
);
}
...
...
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