Drop netlink from function name

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

@@ -152,7 +152,8 @@ int init_single_tun(char *ifname)
   return sock;
 }
 
-int netlink_init_tun(char *ifprefix, int num_if, int id) {//for UE, id = 1, 2, ...,
+int init_tun(char *ifprefix, int num_if, int id)
+{ // for UE, id = 1, 2, ...,
   int ret;
   char ifname[64];
 

openair1/SIMULATION/ETH_TRANSPORT/proto.h

@@ -62,7 +62,7 @@ int multicast_link_read_data_from_sock(uint8_t eNB_flag);
 void clear_eNB_transport_info(uint8_t);
 void clear_UE_transport_info(uint8_t);
 int netlink_init(void);
-int netlink_init_tun(char *ifsuffix, int num_if, int id);
+int init_tun(char *ifsuffix, int num_if, int id);
 int netlink_init_mbms_tun(char *ifsuffix, int id);
 int init_single_tun(const char *ifname);
 void netlink_cleanup(void);

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -2304,14 +2304,14 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask, int id) {
 
     if(UE_NAS_USE_TUN) {
       int num_if = (NFAPI_MODE == NFAPI_UE_STUB_PNF || IS_SOFTMODEM_SIML1 || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF)? MAX_MOBILES_PER_ENB : 1;
-      netlink_init_tun("ue",num_if, id);
+      init_tun("ue", num_if, id);
       if (IS_SOFTMODEM_NOS1)
         nas_config(1, 1, 2, "ue", 10);
       netlink_init_mbms_tun("uem", id);
       nas_config_mbms(1, 2, 2, "uem");
       LOG_I(PDCP, "UE pdcp will use tun interface\n");
     } else if(ENB_NAS_USE_TUN) {
-      netlink_init_tun("enb", 1, 0);
+      init_tun("enb", 1, 0);
       nas_config(1, 1, 1, "enb", 10);
       if(pdcp_optmask & ENB_NAS_USE_TUN_W_MBMS_BIT){
         netlink_init_mbms_tun("enm", 0);