Commit 37207076 authored by Florian Kaltenberger's avatar Florian Kaltenberger

fixing prev commit

parent 7ad6aa37
...@@ -79,7 +79,8 @@ unsigned short config_frames[4] = {2,9,11,13}; ...@@ -79,7 +79,8 @@ unsigned short config_frames[4] = {2,9,11,13};
#include <openair3/ocp-gtpu/gtp_itf.h> #include <openair3/ocp-gtpu/gtp_itf.h>
#include "nfapi/oai_integration/vendor_ext.h" #include "nfapi/oai_integration/vendor_ext.h"
#include "gnb_config.h" #include "gnb_config.h"
#include "openair2/E1AP/e1ap_common.h" #include "E1AP/e1ap_common.h"
#include "LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
#ifdef ENABLE_AERIAL #ifdef ENABLE_AERIAL
#include "fapi/oai-integration/fapi_nvIPC.h" #include "fapi/oai-integration/fapi_nvIPC.h"
#endif #endif
...@@ -768,7 +769,8 @@ int main( int argc, char **argv ) { ...@@ -768,7 +769,8 @@ int main( int argc, char **argv ) {
start_NR_RU(); start_NR_RU();
#ifdef ENABLE_AERIAL #ifdef ENABLE_AERIAL
if(NFAPI_MODE == NFAPI_MODE_AERIAL){ if(NFAPI_MODE == NFAPI_MODE_AERIAL){
nvIPC_Init(RC.nrmac[0]->eth_params_s.local_if_name); gNB_MAC_INST *nrmac = RC.nrmac[0];
nvIPC_Init(nrmac->eth_params_s.local_if_name);
}else{ }else{
AssertFatal(1==0,"Not run as Aerial mode when compiled with AERIAL, if you want to run other (n)FAPI modes, please run ./build_oai without -w AERIAL"); AssertFatal(1==0,"Not run as Aerial mode when compiled with AERIAL, if you want to run other (n)FAPI modes, please run ./build_oai without -w AERIAL");
} }
......
...@@ -720,7 +720,7 @@ int nvIPC_Init(char* if_name) { ...@@ -720,7 +720,7 @@ int nvIPC_Init(char* if_name) {
//nvlog_set_shm_log_level(NULL, NVLOG_ERROR); //nvlog_set_shm_log_level(NULL, NVLOG_ERROR);
//nvlog_set_console_log_level(NULL, NVLOG_ERROR); //nvlog_set_console_log_level(NULL, NVLOG_ERROR);
// Create nv_ipc_t instance // Create nv_ipc_t instance
strcpy(nv_ipc_config->transport_config.shm.prefix,if_name); strcpy(nv_ipc_config.transport_config.shm.prefix,if_name);
if ((ipc = create_nv_ipc_interface(&nv_ipc_config)) == NULL) { if ((ipc = create_nv_ipc_interface(&nv_ipc_config)) == NULL) {
LOG_E(NFAPI_VNF, "%s: create IPC interface failed\n", __func__); LOG_E(NFAPI_VNF, "%s: create IPC interface failed\n", __func__);
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment