Melissa Elkadi
f1cb957c04
Merge branch 'episys/master-nsa' of gitlab.int-episci.com:aburger/openairinterface5g into episys/master-nsa
2021-10-19 14:58:32 -07:00
Melissa Elkadi
7ccf745ddb
Merge remote-tracking branch 'eurecom/episys-merge-nsa' into episys/master-nsa
2021-10-19 14:57:47 -07:00
Melissa Elkadi
7665f397a6
Only calling init_pdcp for NSA mode in gNB executable
...
Also, reverted some init_pdcp logic to match
the develop branch and added NSA mode. Lastly,
added additional error checking for cellConfig
to avoid crash in MAC layer.
2021-10-19 14:52:41 -07:00
Melissa
b4d8de2761
Merge branch 'revert-e630bf1c' into 'episys/master-nsa'
...
Revert "tx_data_request len field is a uint16_t"
See merge request aburger/openairinterface5g!74
2021-10-19 21:08:33 +00:00
Melissa
bcca4aad81
Revert "tx_data_request len field is a uint16_t"
...
This reverts commit e630bf1c52
2021-10-19 21:08:14 +00:00
Melissa Elkadi
e630bf1c52
tx_data_request len field is a uint16_t
...
In the pusharray32, used exclusively by the
tx_data_request, the len argument passed in
is defined as a uint32_t. This update fixes
the passed in argument to be defined as a
uint16_t instead.
2021-10-18 18:50:12 -07:00
Melissa Elkadi
09a90a4838
Merge remote-tracking branch 'origin/episys/master-nsa' into eurecom-episys-merge-nsa
2021-10-18 18:36:44 -07:00
Melissa
09e1b98f87
Merge branch 'episys/david/sctp_update' into 'episys/master-nsa'
...
Adding NSA mode for calling rlc_module_init and SCTP_TASK
See merge request aburger/openairinterface5g!72
2021-10-19 01:36:08 +00:00
Deokseong "David" Kim
a30e27cb11
Adding NSA mode for calling rlc_module_init and SCTP_TASK
2021-10-19 01:36:07 +00:00
Melissa
d1787a605e
Merge branch 'episys/master-nsa+alarm' into 'episys/master-nsa'
...
Set alarm
See merge request aburger/openairinterface5g!71
2021-10-18 22:04:20 +00:00
Michael Cook
69fc902b52
Set alarm
2021-10-18 22:04:19 +00:00
Melissa Elkadi
fe78d8a08f
Only calling rlc_module_init for NSA mode
...
In develop, this function call was commented out.
It is necessary for NSA mode so we have modified
the logic for this case.
2021-10-15 09:13:36 -07:00
Melissa Elkadi
dbe23abcf3
Merge remote-tracking branch 'origin/episys/master-nsa' into eurecom-episys-merge-nsa
2021-10-13 09:57:54 -07:00
Melissa Elkadi
966a4d1d46
Merge remote-tracking branch 'origin/episys/master-nsa' into eurecom-episys-merge-nsa
2021-10-13 09:57:33 -07:00
Melissa
2800fbe0d5
Merge branch 'episys/david/fixing_nr_xlsim_build' into 'episys/master-nsa'
...
Fixed nr_dlsim and nr_ulsim build errors.
See merge request aburger/openairinterface5g!69
2021-10-13 16:27:13 +00:00
Deokseong "David" Kim
a5d23a0e08
Fixed nr_dlsim and nr_ulsim build errors.
2021-10-13 16:27:13 +00:00
Melissa
cb1344274f
Merge branch 'origin-episys-merge-nsa' into 'episys/master-nsa'
...
Merge changes to episys-merge-nsa to episys/master-nsa
See merge request aburger/openairinterface5g!70
2021-10-13 15:44:21 +00:00
Melissa Elkadi
c751b594f1
Merge remote-tracking branch 'eurecom/develop' into eurecom-episys-merge-nsa
2021-10-13 07:03:11 -07:00
Melissa Elkadi
09cec7c72e
Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa
2021-10-13 07:01:27 -07:00
Melissa Elkadi
28391dad6a
Updating pdcp init functions to maintain SA behavior
2021-10-13 06:52:15 -07:00
Raphael Defosseux
4c5a693a14
feat(ci): old L2 simulator test is now disabled in VM pipeline
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-10-07 16:48:26 +02:00
Melissa Elkadi
10432a3fbc
Merge branch 'episys-merge-nsa' of https://gitlab.eurecom.fr/oai/openairinterface5g into eurecom-episys-merge-nsa
2021-10-06 18:31:29 -07:00
Melissa Elkadi
aa9a9e7a41
Merge branch 'episys/master-nsa' into eurecom-episys-merge-nsa
2021-10-06 18:25:32 -07:00
Melissa
42bed9b5ed
Merge branch 'episys/david/restoring_original_NSA_config' into 'episys/master-nsa'
...
Restored the original NAS configuration file.
See merge request aburger/openairinterface5g!68
2021-10-07 01:24:49 +00:00
David Kim
49f2a2ad2b
Restored the original NAS configuration file.
2021-10-06 11:52:49 -07:00
Raphael Defosseux
81e4a7832a
style(ci): LTE F1 split has its own pipeline now. less confusion
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-10-05 11:38:51 +02:00
Raphael Defosseux
31567fe390
doc(release): Updating the 5F RF simulator documentation and docker-compose following the v1.2.0 release of OAI-CN5G
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-10-05 10:56:07 +02:00
Raphael Defosseux
05f0206cf0
style(MAC): lowering one log line to match previous behavior
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-10-04 16:44:18 +02:00
Melissa Elkadi
8c6723ca74
Lowering log level so it is not so verbose
2021-10-01 15:14:50 -07:00
Melissa Elkadi
373d292a48
Merge remote-tracking branch 'origin/episys/master-nsa' into eurecom-episys-merge-nsa
2021-10-01 15:02:21 -07:00
Melissa Elkadi
78b6988735
Merge branch 'episys/master-nsa' into eurecom-episys-merge-nsa
2021-10-01 15:01:57 -07:00
Melissa
7e806ad0e9
Merge branch 'episys/david/moving_config_files_into_a_folder' into 'episys/master-nsa'
...
Updated configuration file location for CI test.
See merge request aburger/openairinterface5g!67
2021-10-01 21:45:30 +00:00
David Kim
eef6ca5037
updated configuration file location for ci test.
2021-10-01 10:21:42 -07:00
Melissa
e915230c28
Merge branch 'episys/david/adding_config_files' into 'episys/master-nsa'
...
Added some config files after restoring original config files.
See merge request aburger/openairinterface5g!66
2021-10-01 01:33:27 +00:00
Melissa Elkadi
d26aefaa87
Merge remote-tracking branch 'origin/episys/david/adding_config_files' into eurecom-episys-merge-nsa
2021-09-30 18:25:40 -07:00
Melissa Elkadi
d586689a33
Merge branch 'episys/master-nsa' of 10.1.1.59:aburger/openairinterface5g into episys/master-nsa
2021-09-30 18:04:37 -07:00
David Kim
bab9c42e59
Added some config files after restoring original config files.
2021-09-30 17:07:44 -07:00
Melissa
680278c03d
Merge branch 'origin-episys-merge-nsa' into 'episys/master-nsa'
...
Syncing our OAI merge branch with our internal NSA master branch
See merge request aburger/openairinterface5g!64
2021-09-30 23:16:47 +00:00
Melissa
3eafdff63a
Syncing our OAI merge branch with our internal NSA master branch
2021-09-30 23:16:46 +00:00
Melissa Elkadi
eccab94b2a
Merge branch 'eurecom-episys-merge-nsa' into origin-episys-merge-nsa
2021-09-30 16:00:17 -07:00
Melissa Elkadi
a30f6791f7
Incorrectly removed timeout variable in PNF
...
Also, putting memset back to help us locate a
bug in the handling of the def_dci_pdu_rel15
2021-09-30 15:57:10 -07:00
Melissa Elkadi
e8631811bd
Merge remote-tracking branch 'eurecom/episys-merge-nsa' into origin-episys-merge-nsa
2021-09-30 06:30:37 -07:00
Melissa Elkadi
11ab8b55f0
Removing unused variables to get rid of warnings.
2021-09-30 06:29:35 -07:00
Melissa Elkadi
3eb6f5313f
Merge branch 'eurecom-episys-merge-nsa' into origin-episys-merge-nsa
2021-09-29 12:31:55 -07:00
Melissa Elkadi
82af1cbc80
Correctly packing UCI indications
...
Also, removing memset for def_dci_pdu_rel15 because
it is setting the DL_BWP_ID = 0 before we have used
it.
2021-09-29 12:25:40 -07:00
Melissa Elkadi
5ab30707d0
Merge remote-tracking branch 'eurecom/episys-merge-nsa' into origin-episys-merge-nsa
2021-09-29 07:36:01 -07:00
Melissa Elkadi
8cf07859ca
Processing crc_ind and rx_inds per PDU in gNb
2021-09-29 07:10:23 -07:00
Melissa
622410db32
Merge branch 'episys/david/processing_crc_ind_rx_ind_per_pdu' into 'episys/master-nsa'
...
processing crc_ind and rx_ind per pdu in gNB.
See merge request aburger/openairinterface5g!63
2021-09-28 21:57:11 +00:00
Deokseong "David" Kim
a3557eb486
processing crc_ind and rx_ind per pdu in gNB.
2021-09-28 21:57:10 +00:00
Melissa
9b1b629843
Merge branch 'develop' into 'episys-merge-nsa'
...
# Conflicts:
# executables/nr-uesoftmodem.c
2021-09-28 20:06:11 +00:00