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
wangjie
OpenXG-RAN
Commits
c62730a5
Commit
c62730a5
authored
Aug 06, 2020
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Only RLC header exists in MAC PDU.
(cherry picked from commit b1be92c272f711c9e4402656246c78adf448968e)
parent
37ee9eb6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+2
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
c62730a5
...
@@ -2520,7 +2520,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -2520,7 +2520,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
}
}
// check for DCCH1 and update header information (assume 2 byte sub-header)
// check for DCCH1 and update header information (assume 2 byte sub-header)
if
(
TBS
-
ta_len
-
header_len_dcch
-
sdu_length_total
>
0
)
{
if
(
TBS
-
ta_len
-
header_len_dcch
-
sdu_length_total
-
2
>
0
)
{
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
DCCH
+
1
,
(
TBS
-
ta_len
-
header_len_dcch
-
sdu_length_total
)
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
DCCH
+
1
,
(
TBS
-
ta_len
-
header_len_dcch
-
sdu_length_total
)
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
,
0
,
0
...
@@ -2995,7 +2995,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -2995,7 +2995,7 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
}
}
// check for DCCH1 and update header information (assume 2 byte sub-header)
// check for DCCH1 and update header information (assume 2 byte sub-header)
if
(
TBS
-
ta_len
-
header_len_dcch
-
sdu_length_total
>
0
)
{
if
(
TBS
-
ta_len
-
header_len_dcch
-
sdu_length_total
-
2
>
0
)
{
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
rnti
,
module_idP
,
module_idP
,
...
...
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