remove all conditional FlexRAN-related compilation directives

targets/RT/USER/lte-softmodem.c

@@ -1319,12 +1319,11 @@ int main( int argc, char **argv )
   }
 #endif
 
-#ifdef FLEXRAN_AGENT_SB_IF
+  /* Start the agent. If it is turned off in the configuration, it won't start */
   RCconfig_flexran();
   for (i = 0; i < RC.nb_L1_inst; i++) {
     flexran_agent_start(i);
   }
-#endif
 
   // init UE_PF_PO and mutex lock
   pthread_mutex_init(&ue_pf_po_mutex, NULL);

targets/RT/USER/lte-softmodem.h

@@ -31,6 +31,8 @@
 #include "PHY/defs.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 
+#include "flexran_agent.h"
+
 #if defined(ENABLE_ITTI)
 #if defined(ENABLE_USE_MME)
 #include "s1ap_eNB.h"
@@ -271,8 +273,4 @@ void init_eNB_afterRU(void);
 extern int stop_L1L2(module_id_t enb_id);
 extern int restart_L1L2(module_id_t enb_id);
 
-#ifdef FLEXRAN_AGENT_SB_IF
-#include "flexran_agent.h"
-#endif
-
 #endif

targets/SIMU/USER/oaisim.c

@@ -76,9 +76,7 @@ uint8_t config_smbv = 0;
 char smbv_ip[16];
 #endif
 
-#if defined(FLEXRAN_AGENT_SB_IF)
-#   include "flexran_agent.h"
-#endif
+#include "flexran_agent.h"
 
 
 #include "oaisim_functions.h"