From 2b99059bff611a82a221f4d89d635944add2b68f Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Fri, 6 Nov 2020 21:50:53 +0100 Subject: [PATCH 1/5] Add missing current_tx_nb which was causing all in uplink to fail --- srsenb/src/stack/mac/scheduler_grid.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srsenb/src/stack/mac/scheduler_grid.cc b/srsenb/src/stack/mac/scheduler_grid.cc index 0f953aac4..1428ed27c 100644 --- a/srsenb/src/stack/mac/scheduler_grid.cc +++ b/srsenb/src/stack/mac/scheduler_grid.cc @@ -1205,6 +1205,8 @@ void sf_sched::set_ul_sched_result(const pdcch_grid_t::alloc_result_t& dci_resul pending_data_before, user->get_pending_ul_old_data(cell_index)); + pusch->current_tx_nb = h->nof_retx(0); + ul_result->nof_dci_elems++; } } From c048d217a94922a2607a2de8efeb664872f572eb Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Thu, 5 Nov 2020 18:40:05 +0100 Subject: [PATCH 2/5] Do not reset softbuffer on each iteration --- srsenb/src/phy/cc_worker.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srsenb/src/phy/cc_worker.cc b/srsenb/src/phy/cc_worker.cc index 01e425df4..e3f2c0034 100644 --- a/srsenb/src/phy/cc_worker.cc +++ b/srsenb/src/phy/cc_worker.cc @@ -301,10 +301,6 @@ void cc_worker::decode_pusch_rnti(stack_interface_phy_lte::ul_sched_grant_t& ul_ bool uci_required = phy->ue_db.fill_uci_cfg(tti_rx, cc_idx, rnti, ul_grant.dci.cqi_request, true, ul_cfg.pusch.uci_cfg); - if (ul_cfg.pusch.softbuffers.rx) { - srslte_softbuffer_rx_reset(ul_cfg.pusch.softbuffers.rx); - } - // Compute UL grant srslte_pusch_grant_t& grant = ul_cfg.pusch.grant; if (srslte_ra_ul_dci_to_grant(&enb_ul.cell, &ul_sf, &ul_cfg.hopping, &ul_grant.dci, &grant)) { From 3395f3099d3ddd67954bc1f24708bdb84ac63bde Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Wed, 18 Nov 2020 10:57:37 +0100 Subject: [PATCH 3/5] add changelog and bump version 20.10.1 --- CHANGELOG | 3 +++ cmake/modules/SRSLTEVersion.cmake | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 52fc43f41..728322820 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Change Log for Releases ======================= +## 20.10.1 + * Fix bug in srsENB that effectively disabled UL HARQ + ## 20.10 * Add Mobility (Intra eNB and S1) and RRC Reestablishment to srsENB * Add new logging framework diff --git a/cmake/modules/SRSLTEVersion.cmake b/cmake/modules/SRSLTEVersion.cmake index 5742f367b..8571465bd 100644 --- a/cmake/modules/SRSLTEVersion.cmake +++ b/cmake/modules/SRSLTEVersion.cmake @@ -20,6 +20,6 @@ SET(SRSLTE_VERSION_MAJOR 20) SET(SRSLTE_VERSION_MINOR 10) -SET(SRSLTE_VERSION_PATCH 0) +SET(SRSLTE_VERSION_PATCH 1) SET(SRSLTE_VERSION_STRING "${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR}.${SRSLTE_VERSION_PATCH}") SET(SRSLTE_SOVERSION 0) From 5b612c860e598de5b4914239745d2e98803a5da9 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 3 Nov 2020 18:33:17 +0000 Subject: [PATCH 4/5] Fix issue copying the libsrslte_rf.so for packaging. --- debian/srslte-core.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/srslte-core.install b/debian/srslte-core.install index 3c846533f..bb2d39b1d 100644 --- a/debian/srslte-core.install +++ b/debian/srslte-core.install @@ -1,3 +1,3 @@ -usr/lib/*/libsrslte_rf.so +usr/lib/*/libsrslte_rf.so* usr/share/srslte usr/bin/srslte_install_configs.sh From 45486b6e2c622ab1d47906521662f087816d7d03 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 19 Nov 2020 11:23:02 +0000 Subject: [PATCH 5/5] Remove -Winline from compiler flags. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0284dd6..5ac265560 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -364,7 +364,7 @@ endif(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clan ADD_C_COMPILER_FLAG_IF_AVAILABLE("-Werror=incompatible-pointer-types" HAVE_ERROR_INCOMPATIBLE) if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-comment -Wno-write-strings -Winline -Wno-unused-result -Wformat -Wmissing-field-initializers -Wtype-limits -std=c99 -fno-strict-aliasing -D_GNU_SOURCE") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-comment -Wno-write-strings -Wno-unused-result -Wformat -Wmissing-field-initializers -Wtype-limits -std=c99 -fno-strict-aliasing -D_GNU_SOURCE") if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -O0 -DDEBUG_MODE -DBUILD_TYPE_DEBUG")