Merge "Fix: modify something that not standardized"

4 files changed, 19 insertions, 19 deletions

diff --git a/stacks/lwip_stack/lwip_src/api/spl_sbr.c b/stacks/lwip_stack/lwip_src/api/spl_sbr.c
index 4c510a5..4c1be2f 100644
--- a/stacks/lwip_stack/lwip_src/api/spl_sbr.c
+++ b/stacks/lwip_stack/lwip_src/api/spl_sbr.c
@@ -157,7 +157,7 @@ _do_send (data_com_msg * m)
   msg_send_buf *_m = (msg_send_buf *) m->buffer;
   if (cpcb == NULL)
     {
-      NS_LOG_CTRL (LOG_CTRL_SEND, STACKX, "NSPOL", NSLOG_ERR,
+      NS_LOG_CTRL (LOG_CTRL_SEND, STACKX, "NSLWIP", NSLOG_ERR,
                    "failed to find target pcb, drop the message]"
                    "module=%u, major=%u, minor=%u",
                    m->param.module_type,
@@ -192,7 +192,7 @@ _do_write (data_com_msg * m)
   msg_write_buf *_m = (msg_write_buf *) m->buffer;
   if ((tpcb == NULL) || (cpcb == NULL))
     {
-      NS_LOG_CTRL (LOG_CTRL_WRITE, STACKX, "NSPOL", NSLOG_ERR,
+      NS_LOG_CTRL (LOG_CTRL_WRITE, STACKX, "NSLWIP", NSLOG_ERR,
                    "failed to find target pcb, drop the message]"
                    "module=%u, major=%u, minor=%u",
                    m->param.module_type,
@@ -225,7 +225,7 @@ _do_recv (data_com_msg * m)
 
   if ((tpcb == NULL) || (cpcb == NULL))
     {
-      NS_LOG_CTRL (LOG_CTRL_RECV, STACKX, "NSPOL", NSLOG_ERR,
+      NS_LOG_CTRL (LOG_CTRL_RECV, STACKX, "NSLWIP", NSLOG_ERR,
                    "failed to find target pcb, drop the message]"
                    "module=%u, major=%u, minor=%u",
                    m->param.module_type,
diff --git a/stacks/lwip_stack/lwip_src/core/spl_pbuf.c b/stacks/lwip_stack/lwip_src/core/spl_pbuf.c
index 54589e8..e4aa014 100644
--- a/stacks/lwip_stack/lwip_src/core/spl_pbuf.c
+++ b/stacks/lwip_stack/lwip_src/core/spl_pbuf.c
@@ -89,7 +89,7 @@ spl_pbuf_alloc_hugepage (spl_pbuf_layer layer, u16_t length,
     {
       /* last_log_prt_time and unprint_log_count indeed have multi-thread issue,
        * but their values don't have precision requirement. No risk. */
-      NS_LOG_CTRL (LOG_CTRL_HUGEPAGE_ALLOC_FAIL, STACKX, "NSPOL", NSLOG_ERR,
+      NS_LOG_CTRL (LOG_CTRL_HUGEPAGE_ALLOC_FAIL, STACKX, "NSLWIP", NSLOG_ERR,
                    "pbuf_alloc_huge: Could not allocate PBUF for SPL_PBUF_HUGE");
 
       return NULL;
diff --git a/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c b/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c
index 03b5998..e2334ea 100644
--- a/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c
+++ b/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c
@@ -996,13 +996,13 @@ int
 init_configuration_reader ()
 {
   int error_number = 0;
-  INITPOL_LOGINF ("RTP", "init_configuration_reader", NULL_STRING,
+  INITPOL_LOGINF ("CONFIGURATION", "init_configuration_reader", NULL_STRING,
                   LOG_INVALID_VALUE, MODULE_INIT_START);
   g_config_data = &g_ip_module_buff;
 
   if (init_ip_module_unix_socket_path () < 0)
     {
-      INITPOL_LOGERR ("RTP", "init_configuration_reader",
+      INITPOL_LOGERR ("CONFIGURATION", "init_configuration_reader",
                       "Error when init path", LOG_INVALID_VALUE,
                       MODULE_INIT_FAIL);
       return -1;
@@ -1012,7 +1012,7 @@ init_configuration_reader ()
   if (listen_fd < 0)
     {
       error_number = errno;
-      INITPOL_LOGERR ("RTP", "init_configuration_reader",
+      INITPOL_LOGERR ("CONFIGURATION", "init_configuration_reader",
                       "when listening ip_module_unix_socket", error_number,
                       MODULE_INIT_FAIL);
       return -1;
@@ -1027,7 +1027,7 @@ init_configuration_reader ()
       return -1;
     }
 
-  INITPOL_LOGINF ("RTP", "init_configuration_reader", NULL_STRING,
+  INITPOL_LOGINF ("CONFIGURATION", "init_configuration_reader", NULL_STRING,
                   LOG_INVALID_VALUE, MODULE_INIT_SUCCESS);
   return 0;
 }
diff --git a/stacks/lwip_stack/lwip_src/netif/spl_hal.c b/stacks/lwip_stack/lwip_src/netif/spl_hal.c
index c7cfca1..596962e 100644
--- a/stacks/lwip_stack/lwip_src/netif/spl_hal.c
+++ b/stacks/lwip_stack/lwip_src/netif/spl_hal.c
@@ -379,7 +379,7 @@ spl_hal_port_zone_init ()
   nsfw_mem_zone create_port_zone;
   nsfw_mem_zone create_port_info;
   struct stackx_port_info *mz_port_info;
-  INITPOL_LOGINF ("RTP", "spl_hal_port_zone_init", NULL_STRING,
+  INITPOL_LOGINF ("HAL", "spl_hal_port_zone_init", NULL_STRING,
                   LOG_INVALID_VALUE, MODULE_INIT_START);
 
   if ((CUR_CFG_HAL_PORT_NUM < 1)
@@ -408,7 +408,7 @@ spl_hal_port_zone_init ()
 
   if (NULL == p_stackx_port_zone)
     {
-      INITPOL_LOGERR ("RTP", "spl_hal_port_zone_init",
+      INITPOL_LOGERR ("HAL", "spl_hal_port_zone_init",
                       "Cannot create memory zone for MP_STACKX_PORT_ZONE information",
                       LOG_INVALID_VALUE, MODULE_INIT_FAIL);
       common_exit (EXIT_FAILURE,
@@ -421,7 +421,7 @@ spl_hal_port_zone_init ()
 
   if (EOK != retVal)
     {
-      INITPOL_LOGERR ("RTP", "spl_hal_port_zone_init", "MEMSET_S return fail",
+      INITPOL_LOGERR ("HAL", "spl_hal_port_zone_init", "MEMSET_S return fail",
                       retVal, MODULE_INIT_FAIL);
       nsfw_mem_zone_release (&create_port_zone.stname);
       return -1;
@@ -445,7 +445,7 @@ spl_hal_port_zone_init ()
 
   if (NULL == mz_port_info)
     {
-      INITPOL_LOGERR ("RTP", "spl_hal_port_zone_init",
+      INITPOL_LOGERR ("HAL", "spl_hal_port_zone_init",
                       "Cannot create memory zone for MP_STACKX_PORT_INFO information",
                       LOG_INVALID_VALUE, MODULE_INIT_FAIL);
       common_exit (EXIT_FAILURE,
@@ -458,7 +458,7 @@ spl_hal_port_zone_init ()
 
   if (EOK != retVal)
     {
-      INITPOL_LOGERR ("RTP", "spl_hal_port_zone_init", "MEMSET_S return fail",
+      INITPOL_LOGERR ("HAL", "spl_hal_port_zone_init", "MEMSET_S return fail",
                       retVal, MODULE_INIT_FAIL);
       nsfw_mem_zone_release (&create_port_info.stname);
       nsfw_mem_zone_release (&create_port_zone.stname);
@@ -470,7 +470,7 @@ spl_hal_port_zone_init ()
 
   p_stackx_port_zone->stackx_one_port = mz_port_info;
 
-  INITPOL_LOGINF ("RTP", "spl_hal_port_zone_init", NULL_STRING,
+  INITPOL_LOGINF ("HAL", "spl_hal_port_zone_init", NULL_STRING,
                   LOG_INVALID_VALUE, MODULE_INIT_SUCCESS);
 
   return 0;
@@ -495,7 +495,7 @@ spl_hal_init (int argc, char *argv[])
 
   /* Init DPDK */
   argc = uStackArgIndex--;
-  INITPOL_LOGINF ("RTP", "hal_init_global", NULL_STRING, LOG_INVALID_VALUE,
+  INITPOL_LOGINF ("HAL", "hal_init_global", NULL_STRING, LOG_INVALID_VALUE,
                   MODULE_INIT_START);
 
   for (idx_init = 0; idx_init < argc; idx_init++)
@@ -1326,7 +1326,7 @@ spl_hal_port_setup ()
   unsigned int i;
   struct stackx_port_info *p_port_info = NULL;
 
-  INITPOL_LOGINF ("RTP", "spl_hal_port_setup", NULL_STRING, LOG_INVALID_VALUE,
+  INITPOL_LOGINF ("HAL", "spl_hal_port_setup", NULL_STRING, LOG_INVALID_VALUE,
                   MODULE_INIT_START);
 
   for (i = num_ports_NIC_start; i < num_ports_NIC; i++)
@@ -1337,7 +1337,7 @@ spl_hal_port_setup ()
         {
           NSPOL_LOGERR ("Error initialising]nic_id=%u", i);
 
-          INITPOL_LOGERR ("RTP", "spl_hal_port_setup", NULL_STRING,
+          INITPOL_LOGERR ("HAL", "spl_hal_port_setup", NULL_STRING,
                           LOG_INVALID_VALUE, MODULE_INIT_FAIL);
 
           return -1;
@@ -1353,7 +1353,7 @@ spl_hal_port_setup ()
     {
       NSPOL_LOGERR ("bond port init failed!");
 
-      INITPOL_LOGERR ("RTP", "spl_hal_port_setup", NULL_STRING,
+      INITPOL_LOGERR ("HAL", "spl_hal_port_setup", NULL_STRING,
                       LOG_INVALID_VALUE, MODULE_INIT_FAIL);
 
       return -1;
@@ -1361,7 +1361,7 @@ spl_hal_port_setup ()
 
   spl_hal_capa_init ();
 
-  INITPOL_LOGINF ("RTP", "spl_hal_port_setup", NULL_STRING, LOG_INVALID_VALUE,
+  INITPOL_LOGINF ("HAL", "spl_hal_port_setup", NULL_STRING, LOG_INVALID_VALUE,
                   MODULE_INIT_SUCCESS);
 
   return 0;