Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
bb346de6
Commit
bb346de6
authored
Feb 03, 2016
by
Rohit Gupta
Browse files
Merge branch 'develop' into feature-34-test_framework
parents
353f5f25
9e8c4333
Changes
2
Hide whitespace changes
Inline
Side-by-side
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
bb346de6
...
...
@@ -1077,7 +1077,7 @@ int32_t rx_pucch_emul(PHY_VARS_eNB *phy_vars_eNB,
}
if
(
UE_id
==
NB_UE_INST
)
{
LOG_
E
(
PHY
,
"rx_pucch_emul:
FATAL, d
idn't find UE with rnti %x
\n
"
,
rnti
);
LOG_
W
(
PHY
,
"rx_pucch_emul:
D
idn't find UE with rnti %x
\n
"
,
rnti
);
return
(
-
1
);
}
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
bb346de6
...
...
@@ -1101,8 +1101,9 @@ boolean_t CCE_allocation_infeasible(int module_idP,
DCI_pdu
->
Num_ue_spec_dci
++
;
ret
=
allocate_CCEs
(
module_idP
,
CC_idP
,
subframe
,
1
);
if
(
ret
==-
1
)
res
=
FALS
E
;
res
=
TRU
E
;
DCI_pdu
->
Num_ue_spec_dci
--
;
}
return
(
res
);
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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