From b24fd337bab228a6411f1b5a57301dadeb23d8f1 Mon Sep 17 00:00:00 2001 From: Teodora Date: Mon, 26 Jan 2026 16:52:42 +0100 Subject: [PATCH] Update xran F release patch The sufficient number of fragments needed for MTU 1500 and 8b compression is 6. However, XRAN_MAX_FRAGMENT must be incremented by one (6+1 = 7). In the MR https://gitlab.eurecom.fr/oai/openairinterface5g/-/merge_requests/3394, XRAN_MAX_FRAGMENT was increased to 6, but the Tx data was actually copied 5 times, and unfortunately I haven't tested end-to-end back then. This commit was successfully tested with Liteon FR1. --- .../tools/oran_fhi_integration_patches/F/oaioran_F.patch | 8 ++++---- radio/fhi_72/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch b/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch index 6d68225bbf..ba10bf38af 100644 --- a/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch +++ b/cmake_targets/tools/oran_fhi_integration_patches/F/oaioran_F.patch @@ -1,5 +1,5 @@ diff --git a/fhi_lib/app/src/common.h b/fhi_lib/app/src/common.h -index ac5f471..94c2d7c 100644 +index ac5f471..ed9ab7d 100644 --- a/fhi_lib/app/src/common.h +++ b/fhi_lib/app/src/common.h @@ -28,7 +28,7 @@ @@ -7,7 +7,7 @@ index ac5f471..94c2d7c 100644 #include -#define VERSIONX "oran_f_release_v1.0" -+#define VERSIONX "oran_f_release_v1.6" ++#define VERSIONX "oran_f_release_v1.7" #define APP_O_DU 0 #define APP_O_RU 1 @@ -173,7 +173,7 @@ index eccc4ae..a97fdc6 100644 CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF) CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF) diff --git a/fhi_lib/lib/api/xran_fh_o_du.h b/fhi_lib/lib/api/xran_fh_o_du.h -index bacf597..2aeaaae 100644 +index bacf597..18597d6 100644 --- a/fhi_lib/lib/api/xran_fh_o_du.h +++ b/fhi_lib/lib/api/xran_fh_o_du.h @@ -141,8 +141,8 @@ extern "C" { @@ -182,7 +182,7 @@ index bacf597..2aeaaae 100644 -#define XRAN_MAX_FRAGMENT (4) /**< Max number of fragmentations in single symbol */ -#define XRAN_MAX_SET_BFWS (64) /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */ -+#define XRAN_MAX_FRAGMENT (6) /**< Max number of fragmentations in single symbol */ ++#define XRAN_MAX_FRAGMENT (7) /**< Max number of fragmentations in single symbol */ +#define XRAN_MAX_SET_BFWS (1) //(64) /**< Assumed 64Ant, BFP 9bit with 9K jumbo frame */ #define XRAN_MAX_PKT_BURST (448+4) /**< 4x14x8 symbols per ms */ diff --git a/radio/fhi_72/CMakeLists.txt b/radio/fhi_72/CMakeLists.txt index 6e918650e5..c0546aaca8 100644 --- a/radio/fhi_72/CMakeLists.txt +++ b/radio/fhi_72/CMakeLists.txt @@ -17,7 +17,7 @@ add_library(oran_fhlib_5g MODULE ) set(E_VERSION 5.1.6) -set(F_VERSION 6.1.6) +set(F_VERSION 6.1.7) find_package(xran REQUIRED) if(xran_VERSION VERSION_EQUAL E_VERSION)