From 7ee619b0bc47a7266533aa29c2863057a487f082 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 1 Apr 2026 21:37:18 +0200 Subject: [PATCH] MACRLCs my/remote_portc: remove, is unused --- openair2/GNB_APP/MACRLC_nr_paramdef.h | 6 ------ openair2/GNB_APP/gnb_config.c | 4 ++-- openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h index 953c9d8ebd..2c8e2dab62 100644 --- a/openair2/GNB_APP/MACRLC_nr_paramdef.h +++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h @@ -19,8 +19,6 @@ #define MACRLC_LOCAL_N_ADDRESS "local_n_address" #define MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u" #define MACRLC_REMOTE_N_ADDRESS "remote_n_address" -#define MACRLC_LOCAL_N_PORTC "local_n_portc" -#define MACRLC_REMOTE_N_PORTC "remote_n_portc" #define MACRLC_LOCAL_N_PORTD "local_n_portd" #define MACRLC_REMOTE_N_PORTD "remote_n_portd" #define MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference" @@ -89,8 +87,6 @@ {MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \ {MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ {MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ - {MACRLC_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \ - {MACRLC_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \ {MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ {MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ {MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \ @@ -155,8 +151,6 @@ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ { .s2 = { config_check_intrange, {0, 31} } }, /* DL min MCS */ \ { .s2 = { config_check_intrange, {0, 31} } }, /* DL max MCS */ \ { .s5 = { NULL } }, \ diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index 8d0f365566..0a8d692dc8 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -1677,8 +1677,8 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) char **f1uaddr = gpd(params, np, MACRLC_LOCAL_N_ADDRESS_F1U)->strptr; RC.nrmac[j]->f1u_addr = f1uaddr != NULL ? strdup(*f1uaddr) : strdup(*f1caddr); RC.nrmac[j]->eth_params_n.remote_addr = strdup(*gpd(params, np, MACRLC_REMOTE_N_ADDRESS)->strptr); - RC.nrmac[j]->eth_params_n.my_portc = *gpd(params, np, MACRLC_LOCAL_N_PORTC)->iptr; - RC.nrmac[j]->eth_params_n.remote_portc = *gpd(params, np, MACRLC_REMOTE_N_PORTC)->iptr; + RC.nrmac[j]->eth_params_n.my_portc = 0; // not used + RC.nrmac[j]->eth_params_n.remote_portc = 0; // not used RC.nrmac[j]->eth_params_n.my_portd = *gpd(params, np, MACRLC_LOCAL_N_PORTD)->iptr; RC.nrmac[j]->eth_params_n.remote_portd = *gpd(params, np, MACRLC_REMOTE_N_PORTD)->iptr; RC.nrmac[j]->eth_params_n.transp_preference = ETH_UDP_MODE; diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c index 53da2d310e..7d5efc04d3 100644 --- a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c +++ b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c @@ -18,6 +18,7 @@ static f1ap_net_config_t read_DU_IP_config(const eth_params_t* f1_params, const char *f1u_ip_addr) { + AssertFatal(f1_params->my_portc == 0 && f1_params->remote_portc == 0, "portc not supported, must be 0\n"); f1ap_net_config_t nc = {0}; nc.CU_f1_ip_address= strdup(f1_params->remote_addr);