Cedric Roux
c1d96a49ca
Merge remote-tracking branch 'origin/nasmesh_new_kernel' into develop_integration_2018_w36
2018-09-07 17:01:28 +02:00
Cedric Roux
73da898f9b
integration fix: fix bad merge conflict resolution + fix compilation error
2018-09-07 16:57:55 +02:00
Cedric Roux
afb2fd4012
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w36
2018-09-07 16:15:13 +02:00
Cedric Roux
62a1a3dad4
Merge remote-tracking branch 'origin/347-remove-assertion-ue-dci-handling' into develop_integration_2018_w36
2018-09-07 16:15:03 +02:00
Cedric Roux
2cb87ddd02
Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
...
Conflicts:
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Cedric Roux
2c9be8c102
Merge remote-tracking branch 'origin/fix-nfapi-in-scheduler' into develop_integration_2018_w36
2018-09-07 16:08:09 +02:00
Cedric Roux
026b9f6ab0
Merge remote-tracking branch 'origin/fix-libconfig' into develop_integration_2018_w36
2018-09-07 16:07:49 +02:00
Cedric Roux
b0eff6c0a6
Merge remote-tracking branch 'origin/scheduler-small-fix' into develop_integration_2018_w36
2018-09-07 16:07:23 +02:00
Cedric Roux
4afc053606
Merge remote-tracking branch 'origin/dft-size-fixes' into develop_integration_2018_w36
2018-09-07 16:07:08 +02:00
Cedric Roux
5e9a85b1ad
Merge remote-tracking branch 'origin/fix-unwanted-comment-end' into develop_integration_2018_w36
2018-09-07 16:06:49 +02:00
Cedric Roux
cbdc8f662a
Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36
2018-09-07 16:04:05 +02:00
Cedric Roux
20797a52f8
Merge remote-tracking branch 'origin/generate_sss_tables' into develop_integration_2018_w36
...
Conflicts:
openair1/PHY/INIT/init_top.c
2018-09-07 16:01:58 +02:00
Cedric Roux
9051a0ec45
Merge branch 'recode_itti_from_scratch' into develop_integration_2018_w36
...
Note: we don't include the last commit from origin/recode_itti_from_scratch
because it is just astyle formatting. As of today we don't enforce
astyle and including this work would lead to future merge conflicts.
A proper process to enforce astyle has to be put in place. In the
meantime, no astyle allowed in commits if the changes are too big
and not relevant to work done.
2018-09-07 15:57:13 +02:00
Cedric Roux
8b4d303375
Merge remote-tracking branch 'origin/generate_75KHz_tables' into develop
2018-09-07 15:53:26 +02:00
laurent
7d22622474
fix nasmesh kernel 4.15
2018-09-07 15:44:57 +02:00
Konstantinos Alexandris
938e0242e2
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/ENB_APP/enb_app.c
openair2/X2AP/x2ap_common.h
2018-09-07 15:30:49 +02:00
Konstantinos Alexandris
2b85c4a3a6
Pass multi socket descriptor in SCTP + add SCTP multi init req/resp mechanism
2018-09-07 15:15:41 +02:00
Florian Kaltenberger
7591761247
removing assertion from dci handling (could come from wrongly detected DCI)
2018-09-07 06:09:36 -07:00
Florian Kaltenberger
e8f452dabe
removing assertion from dci handling (could come from wrongly detected DCI)
2018-09-07 05:54:44 -07:00
Masayuki HARADA
c1359a103f
Fix wrong slice_allocation loop in fairRR scheduler
2018-09-06 19:03:05 +02:00
Cedric Roux
8534982afe
bugfix: check that we are manipulating the structure for the correct RNTI
...
The bug popped up when one UE was doing TCP UL iperf and a second UE
attempted to connect. A crash of the eNB happened because we changed
the wrong NFAPI structure in a TTI where both UEs are scheduled.
Something like that.
2018-09-06 16:42:10 +02:00
hongzhi wang
136ca508c5
nr ue clean warnings
2018-09-06 16:04:21 +02:00
Konstantinos Alexandris
1729b3dc66
X2AP: init funcs (register/association) + handler/management functions
...
SCTP: one to many sockets implementation
2018-09-06 15:49:59 +02:00
Raphael Defosseux
609e6521b0
CI: adding email notification
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-06 13:06:28 +02:00
Raphael Defosseux
c8eb68d556
CI: adding email notification w/ HTML reports in attachment
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-06 12:21:34 +02:00
laurent
46231a5d5d
merge with latest develop
2018-09-06 09:43:26 +02:00
laurent
abbffef015
fix some exit situations, that was badly done by SIGUSR1 handler
2018-09-05 17:03:19 +02:00
hongzhi wang
2714854e6f
Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch
2018-09-05 15:36:22 +02:00
hongzhi wang
35c705787d
UE nr pdcch update
2018-09-05 15:35:14 +02:00
Guy De Souza
a1ae155b4e
Minor size fix
2018-09-05 15:06:48 +02:00
Robert Schmidt
70e1841bb1
Fix: RAN API: remove_ul_slice() frees ul sched_name pointer, when sched_name set, free it when resetting
2018-09-05 14:21:39 +02:00
Robert Schmidt
cbc78cd3db
Don't warn of ignoring sorting
2018-09-05 14:21:39 +02:00
Robert Schmidt
7162bf6895
Bugfix: Assure available_rbs is positive
2018-09-05 14:21:39 +02:00
Robert Schmidt
066ab90402
Bugfix: Give correct first_rb value to UE
2018-09-05 14:21:39 +02:00
Robert Schmidt
d798e03e9d
fix rb_table loop
2018-09-05 14:21:39 +02:00
Robert Schmidt
f86b51990c
restart: first stop RU, then eNB proc threads
2018-09-05 14:21:39 +02:00
Robert Schmidt
ff83dc7017
Fix greedy allocation: schedule not more than what slice has
2018-09-05 14:21:39 +02:00
Robert Schmidt
fa27b6dcce
Fix: Correct numbering of protobuf messages (as in RTC)
2018-09-05 14:21:39 +02:00
Robert Schmidt
af83d352c8
Fix: use frame_subframe2_dl_harq_pid()
2018-09-05 14:21:39 +02:00
Robert Schmidt
5a1e8c2869
Lock sync_var access in restart_L1L2()
2018-09-05 14:21:39 +02:00
Robert Schmidt
c1b024d354
stop_L1L2(): Do not turn of RF, is done in ru_thread
2018-09-05 14:21:39 +02:00
Robert Schmidt
d3afce4f3c
Print detailed info why mutex locking failed
2018-09-05 14:21:39 +02:00
Robert Schmidt
1f60f4ecea
Log Level Debug for Freeing Transport Channel Msg
2018-09-05 14:21:39 +02:00
Robert Schmidt
9f04614304
Remove huge comment from sort_UEs()
...
Commit 7823858e2d11e8cabc1ca7bf7f507b9a050942d3 introduced this as a comment.
2018-09-05 14:21:38 +02:00
Robert Schmidt
07ad2470d1
Remove warnings pre_processor_fairRR
2018-09-05 14:21:36 +02:00
Raphael Defosseux
87d5a07ee1
CI: removing UL iperf test at 20 MHz on basic simulator
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-05 10:59:59 +02:00
Raphael Defosseux
d721e2de1a
CI: improved basic simulator testing
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-05 09:47:19 +02:00
Guy De Souza
326a40a9b7
All contiguous RB update
2018-09-04 17:42:44 +02:00
Cedric Roux
487a599b7b
bugfix: fix memory error
...
Using valgrind revealed that those two arrays
were too small. Let's use 512 bytes, which should
be enough for every practical cases.
2018-09-04 16:18:46 +02:00
Cedric Roux
c83fc1b544
bugfix: fix compilation problem
...
This includes damages check_vcd.c in the T tracer
(in develop branch).
2018-09-04 15:18:59 +02:00