Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
6c0af254
Commit
6c0af254
authored
7 years ago
by
tomita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to avoid Segmemtation Fault in case of physicalConfigDedicated is NULL.
parent
f957f990
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
18 deletions
+24
-18
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+24
-18
No files found.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
6c0af254
...
...
@@ -1451,24 +1451,30 @@ fill_nfapi_harq_information(module_id_t module_idP,
// [UE_id].physicalConfigDedicated->
// pucch_ConfigDedicated != NULL,
// "pucch_ConfigDedicated is null for TDD!\n");
if
((
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
->
pucch_ConfigDedicated
!=
NULL
)
&&
(
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
->
pucch_ConfigDedicated
->
tdd_AckNackFeedbackMode
!=
NULL
)
&&
(
*
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
->
pucch_ConfigDedicated
->
tdd_AckNackFeedbackMode
==
PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing
))
{
harq_information
->
harq_information_rel10_tdd
.
harq_size
=
2
;
// 2-bit ACK/NAK
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
=
1
;
// multiplexing
}
else
{
harq_information
->
harq_information_rel10_tdd
.
harq_size
=
1
;
// 1-bit ACK/NAK
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
=
0
;
// bundling
}
harq_information
->
harq_information_rel10_tdd
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG
;
if
(
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
!=
NULL
){
if
((
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
->
pucch_ConfigDedicated
!=
NULL
)
&&
(
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
->
pucch_ConfigDedicated
->
tdd_AckNackFeedbackMode
!=
NULL
)
&&
(
*
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
->
pucch_ConfigDedicated
->
tdd_AckNackFeedbackMode
==
PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing
))
{
harq_information
->
harq_information_rel10_tdd
.
harq_size
=
2
;
// 2-bit ACK/NAK
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
=
1
;
// multiplexing
}
else
{
harq_information
->
harq_information_rel10_tdd
.
harq_size
=
1
;
// 1-bit ACK/NAK
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
=
0
;
// bundling
}
}
else
{
harq_information
->
harq_information_rel10_tdd
.
harq_size
=
1
;
// 1-bit ACK/NAK
harq_information
->
harq_information_rel10_tdd
.
ack_nack_mode
=
0
;
// bundling
}
harq_information
->
harq_information_rel10_tdd
.
tl
.
tag
=
NFAPI_UL_CONFIG_REQUEST_HARQ_INFORMATION_REL10_TDD_TAG
;
harq_information
->
harq_information_rel10_tdd
.
n_pucch_1_0
=
cc
->
radioResourceConfigCommon
->
pucch_ConfigCommon
.
n1PUCCH_AN
+
cce_idxP
;
...
...
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