Robert Schmidt
ef78dcde55
send UE Capabilities to Flexran RTController
2018-02-13 19:00:34 +01:00
Raymond Knopp
e9d536972c
updated dlsim to FAPI interfaces
2018-02-13 07:18:52 -08:00
Robert Schmidt
12ac8b180d
prevent warnings: init Protocol__FlexHeader to NULL
2018-02-13 14:29:15 +01:00
Robert Schmidt
c33e184dde
bugfix: selectively inform FlexRAN RTController of UE state change
2018-02-13 14:25:50 +01:00
Robert Schmidt
a68d70a13d
bugfix: prevent segfault in pre_processor.c
2018-02-13 14:23:54 +01:00
Navid Nikaein
5865c141d0
Improve UL/DL MCS assignment
2018-02-13 11:45:16 +01:00
jftt_wangshanshan
7b9422a8c5
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-13 17:08:57 +08:00
jftt_wangshanshan
831ce2e910
Fix frame_cnt to prevent it from getting too big
2018-02-13 17:08:32 +08:00
naoi
5eac636b34
FIX: E-RAB is removed when UE's status is E_RAB_STATUS_DONE.
2018-02-13 17:57:44 +09:00
Wu Jing
ebecb55733
add if-else case for first_rb=3 when TDD config1 20MHz in ULSCH_pre_processor
2018-02-13 12:30:25 +09:00
Cedric Roux
e794f920c7
integration fix: remove definition of OAI_NW_DRIVER_USE_NETLINK in source file
...
This is done better by commit 6210eb056f .
2018-02-12 16:15:09 +01:00
Cedric Roux
d68ddebe21
Merge branch 'develop-oaisim-ue-hotfix' into develop_integration_2018_w07
2018-02-12 16:11:17 +01:00
Emad
ddd3e97f14
srb_id must be between [1,3]
2018-02-12 16:07:22 +01:00
Robert Schmidt
135b06ae66
bugfix: only send eNB stats to controller if agent enabled
2018-02-12 15:21:02 +01:00
Robert Schmidt
219b5bc92f
make FlexRAN Agent activation configurable
2018-02-12 15:11:19 +01:00
Robert Schmidt
adec4e39df
remove all conditional FlexRAN-related compilation directives
2018-02-12 14:38:44 +01:00
Robert Schmidt
3768723c62
remove unnecessary comments
2018-02-12 13:50:48 +01:00
Robert Schmidt
ceece5694d
rename flexran_slice_member() -> ue_slice_membership()
2018-02-12 13:50:48 +01:00
Robert Schmidt
8108d59a0b
no regression, fixes compilation warnings&errors
2018-02-12 13:50:48 +01:00
Robert Schmidt
cf0a5ca920
fix RAN API due to merge + repair functions
2018-02-12 13:50:48 +01:00
Robert Schmidt
a78aaa451c
fix slicing capability in ulsch scheduler
2018-02-12 13:50:45 +01:00
Wu Jing
c641f334bb
fix total usable RBs when pucch rb=6
2018-02-12 18:38:26 +09:00
jftt_wangshanshan
19a2b37c75
Fix bug in Adaptive Retransmission for ULSCH. Fix Qm,mcs,TBS setting.
2018-02-12 16:52:48 +08:00
jftt_wangshanshan
5a461002a1
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-12 14:01:46 +08:00
Xu Bo
dcdda7ba35
set UL schedule period to 5Frame for TDD config1
2018-02-11 18:10:11 +09:00
jftt_wangshanshan
4898d609e6
Fix a bug in HI_DCI0_req clear
2018-02-11 16:42:12 +08:00
Raymond Knopp
4070f0bfdf
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
...
Conflicts:
openair2/LAYER2/MAC/config.c
2018-02-09 22:47:29 -08:00
Raymond Knopp
b073445f99
removed NFAPI libraries from oaisim target. added #define to allow ue_ip.ko to compile. This should be revisited, there's a problem in CMakelists.txt, no flags.cmake generate for all 3 kernel modules.
2018-02-09 19:15:30 +01:00
Robert Schmidt
8877b18a9a
fix eNB_ulsch_dlsch_scheduler() broken by merge 2c8443121d
2018-02-09 19:05:36 +01:00
Robert Schmidt
e8e58e2594
Merge branch 'develop' into feature-merge-merge-f68
2018-02-09 17:10:41 +01:00
Robert Schmidt
c518ed89e2
bugfix after merge
2018-02-08 19:12:20 +01:00
Robert Schmidt
a21bc513bb
Merge branch 'develop' into feature-merge-f68
2018-02-08 18:05:28 +01:00
jftt_wangshanshan
1bc258a729
Merge branch 'sp3_tdd_config1' of http://takoyaki.np1s.css.fujitsu.com:8000/gitlab/vran/release_enb into sp3_tdd_config1
2018-02-08 18:09:53 +08:00
Cedric Roux
7ce1621622
Merge remote-tracking branch 'origin/fix-sib3-2018-w06' into develop_integration_2018_w06
2018-02-08 11:04:27 +01:00
jftt_wangshanshan
9ba0355000
add switch tdd config to Msg4 timing setting
2018-02-08 18:04:23 +08:00
Cedric Roux
f3e7a72e55
Merge remote-tracking branch 'origin/fix-cqi-update-2018-w06' into develop_integration_2018_w06
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-02-08 11:03:50 +01:00
Cedric Roux
724970e2ef
Merge remote-tracking branch 'origin/fix-ul-buffer-info-2018-w06' into develop_integration_2018_w06
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2018-02-08 10:59:19 +01:00
jftt_wangshanshan
89b261efe5
Fix bug in schedule_ulsch
2018-02-08 16:28:13 +08:00
Wu Jing
8fffe90dbe
fix hundreds_of_ues issue(n1_PUCCH_AN DAI) for TDD cofnig1
2018-02-08 02:24:54 +00:00
Cedric Roux
f6345f048e
Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-02-07 15:12:08 +01:00
Cedric Roux
1fce1bbf82
bugfix: fix SIB3 encoding
...
The unused bits are the lower bits, so we need to shift.
Not sure that the value 1 is what we want though.
2018-02-07 14:51:50 +01:00
naoi
0efa1185f3
fix: UE dosen't respond to pdcch order(contention based)
2018-02-07 20:40:06 +09:00
Cedric Roux
c0bcd78673
bugfix: don't take into account report CQI in case of NACK or DTX
...
The problem that may happen is that when the UE does not transmit
on PUCCH (for whatever reason) we may get no signal at all, and
thus compute a very low CQI. Later on we may ask the UE to transmit
louder which may lead to saturation and more problems.
The solution is simple: don't care about CQI in case of DTX
(and NACK also, as done for PUSCH).
Only FDD case done.
For TDD it seems that:
- nfapi structures are not correct. See nfapi_harq_indication_tdd_rel13_t
in nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h, all the cases
(bundling, multiplex, ...) use nfapi_harq_indication_tdd_harq_data_t
- the function extract_harq does not handle TDD
2018-02-07 12:31:26 +01:00
Cedric Roux
9b7364a3ca
minor: fix AssertFatal
2018-02-07 12:30:00 +01:00
Cedric Roux
eccb96c4c2
bugfix: fix UL over scheduling
...
There is too much UL scheduling because the buffer status is
overestimated.
This commit tries to make things simpler.
2018-02-06 14:37:03 +01:00
jftt_wangshanshan
e8300aa944
Don't use assert since the comment above said it's perfectly possible to have this NULL here.
2018-02-06 16:50:27 +08:00
Xu Bo
5c76360c2d
Fix special subframe only use 2 symbols to transmit pdcch
2018-02-06 11:01:05 +09:00
Cedric Roux
a21c0b809f
bugfix: fix RRC Release 10 compilation
...
The following compilation did not work anymore:
./build_oai --eNB -w USRP -r Rel10 -c
(Rel8 still does not work.)
2018-02-05 17:21:40 +01:00
Xu Bo
f9f20c7300
allocate_CCEs only called on dl subframes
2018-02-05 20:17:53 +09:00
Xu Bo
4387070cda
fix merge bug
2018-02-05 17:25:57 +09:00