From e1a7a2e8af8ce0244d7dce86cbb1812e33b2fa72 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 1 Apr 2026 21:56:21 +0200 Subject: [PATCH] Remove L1s.local_n_portc: not used Also remove intermediate variable eth_params_n that is not used anywhere. --- openair1/PHY/defs_gNB.h | 2 -- openair2/GNB_APP/L1_nr_paramdef.h | 2 -- openair2/GNB_APP/gnb_config.c | 18 ++++++------------ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index e0cd78509e..ca5950a5e1 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -329,8 +329,6 @@ typedef struct PHY_VARS_gNB_s { gNB_L1_proc_t proc; int num_RU; RU_t *RU_list[MAX_NUM_RU_PER_gNB]; - /// Ethernet parameters for northbound midhaul interface - eth_params_t eth_params_n; /// Ethernet parameters for fronthaul interface eth_params_t eth_params; int rx_total_gain_dB; diff --git a/openair2/GNB_APP/L1_nr_paramdef.h b/openair2/GNB_APP/L1_nr_paramdef.h index 947b7d710c..1faa03c475 100644 --- a/openair2/GNB_APP/L1_nr_paramdef.h +++ b/openair2/GNB_APP/L1_nr_paramdef.h @@ -15,7 +15,6 @@ /* L1 configuration parameters names */ #define L1_LOCAL_N_ADDRESS "local_n_address" #define L1_REMOTE_N_ADDRESS "remote_n_address" -#define L1_LOCAL_N_PORTC "local_n_portc" #define L1_REMOTE_N_PORTC "remote_n_portc" #define L1_LOCAL_N_PORTD "local_n_portd" #define L1_REMOTE_N_PORTD "remote_n_portd" @@ -47,7 +46,6 @@ {L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \ {L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ {L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ - {L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \ {L1_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \ {L1_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ {L1_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index ed25c91787..4928d98183 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -851,19 +851,13 @@ void RCconfig_NR_L1(void) if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "local_mac") == 0) { // do nothing } else if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "nfapi") == 0) { - gNB->eth_params_n.my_addr = strdup(*gpd(params, np, L1_LOCAL_N_ADDRESS)->strptr); - gNB->eth_params_n.remote_addr = strdup(*gpd(params, np, L1_REMOTE_N_ADDRESS)->strptr); - gNB->eth_params_n.my_portc = *gpd(params, np, L1_LOCAL_N_PORTC)->iptr; - gNB->eth_params_n.remote_portc = *gpd(params, np, L1_REMOTE_N_PORTC)->iptr; - gNB->eth_params_n.my_portd = *gpd(params, np, L1_LOCAL_N_PORTD)->iptr; - gNB->eth_params_n.remote_portd = *gpd(params, np, L1_REMOTE_N_PORTD)->iptr; - gNB->eth_params_n.transp_preference = ETH_UDP_MODE; + char *my_addr = strdup(*gpd(params, np, L1_LOCAL_N_ADDRESS)->strptr); + char *remote_addr = strdup(*gpd(params, np, L1_REMOTE_N_ADDRESS)->strptr); + int remote_portc = *gpd(params, np, L1_REMOTE_N_PORTC)->iptr; + int my_portd = *gpd(params, np, L1_LOCAL_N_PORTD)->iptr; + int remote_portd = *gpd(params, np, L1_REMOTE_N_PORTD)->iptr; - configure_nr_nfapi_pnf(gNB->eth_params_n.remote_addr, - gNB->eth_params_n.remote_portc, - gNB->eth_params_n.my_addr, - gNB->eth_params_n.my_portd, - gNB->eth_params_n.remote_portd); + configure_nr_nfapi_pnf(remote_addr, remote_portc, my_addr, my_portd, remote_portd); } else { // other midhaul, do nothing }