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
ZhouShuya
OpenXG-RAN
Commits
6f4ee013
Commit
6f4ee013
authored
May 07, 2018
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix RM912 SegmentFault in dlsch_coding while using a UE which has been removed
parent
55ed45df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
nfapi/oai_integration/nfapi_pnf.c
nfapi/oai_integration/nfapi_pnf.c
+4
-0
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+8
-0
No files found.
nfapi/oai_integration/nfapi_pnf.c
View file @
6f4ee013
...
@@ -840,6 +840,10 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_dl_config_request
...
@@ -840,6 +840,10 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t* pnf_p7, nfapi_dl_config_request
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
UE_id
][
0
];
LTE_eNB_DLSCH_t
*
dlsch0
=
eNB
->
dlsch
[
UE_id
][
0
];
//LTE_eNB_DLSCH_t *dlsch1 = eNB->dlsch[UE_id][1];
//LTE_eNB_DLSCH_t *dlsch1 = eNB->dlsch[UE_id][1];
int
harq_pid
=
dlsch0
->
harq_ids
[
sfn
%
2
][
sf
];
int
harq_pid
=
dlsch0
->
harq_ids
[
sfn
%
2
][
sf
];
if
(
harq_pid
>=
dlsch0
->
Mdlharq
)
{
LOG_E
(
PHY
,
"pnf_phy_dl_config_req illegal harq_pid %d
\n
"
,
harq_pid
);
return
(
-
1
);
}
uint8_t
*
dlsch_sdu
=
tx_pdus
[
UE_id
][
harq_pid
];
uint8_t
*
dlsch_sdu
=
tx_pdus
[
UE_id
][
harq_pid
];
memcpy
(
dlsch_sdu
,
tx_pdu
->
segments
[
0
].
segment_data
,
tx_pdu
->
segments
[
0
].
segment_length
);
memcpy
(
dlsch_sdu
,
tx_pdu
->
segments
[
0
].
segment_data
,
tx_pdu
->
segments
[
0
].
segment_length
);
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
View file @
6f4ee013
...
@@ -400,6 +400,10 @@ int dlsch_encoding_2threads(PHY_VARS_eNB *eNB,
...
@@ -400,6 +400,10 @@ int dlsch_encoding_2threads(PHY_VARS_eNB *eNB,
unsigned
short
iind
;
unsigned
short
iind
;
unsigned
char
harq_pid
=
dlsch
->
harq_ids
[
frame
%
2
][
subframe
];
unsigned
char
harq_pid
=
dlsch
->
harq_ids
[
frame
%
2
][
subframe
];
if
(
harq_pid
>=
dlsch
->
Mdlharq
)
{
LOG_E
(
PHY
,
"dlsch_encoding_2threads illegal harq_pid %d
\n
"
,
harq_pid
);
return
(
-
1
);
}
unsigned
short
nb_rb
=
dlsch
->
harq_processes
[
harq_pid
]
->
nb_rb
;
unsigned
short
nb_rb
=
dlsch
->
harq_processes
[
harq_pid
]
->
nb_rb
;
unsigned
int
A
;
unsigned
int
A
;
unsigned
char
mod_order
;
unsigned
char
mod_order
;
...
@@ -584,6 +588,10 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
...
@@ -584,6 +588,10 @@ int dlsch_encoding(PHY_VARS_eNB *eNB,
LTE_DL_FRAME_PARMS
*
frame_parms
=
&
eNB
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
frame_parms
=
&
eNB
->
frame_parms
;
unsigned
char
harq_pid
=
dlsch
->
harq_ids
[
frame
%
2
][
subframe
];
unsigned
char
harq_pid
=
dlsch
->
harq_ids
[
frame
%
2
][
subframe
];
if
(
harq_pid
>=
dlsch
->
Mdlharq
)
{
LOG_E
(
PHY
,
"dlsch_encoding illegal harq_pid %d
\n
"
,
harq_pid
);
return
(
-
1
);
}
unsigned
short
nb_rb
=
dlsch
->
harq_processes
[
harq_pid
]
->
nb_rb
;
unsigned
short
nb_rb
=
dlsch
->
harq_processes
[
harq_pid
]
->
nb_rb
;
unsigned
int
A
;
unsigned
int
A
;
unsigned
char
mod_order
;
unsigned
char
mod_order
;
...
...
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