diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index de96389035..294091c648 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -132,7 +132,6 @@ services: -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.171 - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du networks: diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index 515e91d110..8477a72dc5 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -106,7 +106,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169090000 --CO -400000000 --ssb 378 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index ef7055b65b..3135dcd258 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -106,7 +106,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -125,7 +124,6 @@ services: container_name: rfsim5g-oai-nr-ue2 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -144,7 +142,6 @@ services: container_name: rfsim5g-oai-nr-ue3 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -163,7 +160,6 @@ services: container_name: rfsim5g-oai-nr-ue4 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -182,7 +178,6 @@ services: container_name: rfsim5g-oai-nr-ue5 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -201,7 +196,6 @@ services: container_name: rfsim5g-oai-nr-ue6 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -220,7 +214,6 @@ services: container_name: rfsim5g-oai-nr-ue7 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -239,7 +232,6 @@ services: container_name: rfsim5g-oai-nr-ue8 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -258,7 +250,6 @@ services: container_name: rfsim5g-oai-nr-ue9 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: @@ -277,7 +268,6 @@ services: container_name: rfsim5g-oai-nr-ue10 environment: USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 29ebe61419..c1bc611cb7 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -106,7 +106,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index 133c36f36e..9a565233bc 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -107,7 +107,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 468f7bb67e..8b8bb1ca7b 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -277,7 +277,6 @@ services: -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 208990100001100 --rfsimulator.serveraddr 192.168.78.2 - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du networks: @@ -300,7 +299,6 @@ services: -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 208990100001101 --uicc0.nssai_sst 2 --rfsimulator.serveraddr 192.168.78.3 - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-du2 networks: diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index c5657efb41..1bec0ba779 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -107,7 +107,6 @@ services: container_name: rfsim5g-oai-nr-ue environment: USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time - ASAN_OPTIONS: detect_leaks=0 depends_on: - oai-gnb networks: diff --git a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c index 55715e4ecb..09b2312054 100644 --- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c +++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c @@ -211,12 +211,13 @@ void release_mac_configuration(NR_UE_MAC_INST_t *mac) free(sc->maxMIMO_Layers_PUSCH); memset(&mac->sc_info, 0, sizeof(mac->sc_info)); + mac->current_DL_BWP = NULL; + mac->current_UL_BWP = NULL; + for (int i = 0; i < mac->dl_BWPs.count; i++) release_dl_BWP(mac, i); for (int i = 0; i < mac->ul_BWPs.count; i++) release_ul_BWP(mac, i); - mac->current_DL_BWP = NULL; - mac->current_UL_BWP = NULL; for (int i = 0; i < NR_MAX_NUM_LCID; i++) { nr_release_mac_config_logicalChannelBearer(mac, i + 1);