Rename "interface" struct

To avoid problems with Microsoft compilers

Author: olbjo

src/common/pf_lldp.c

@@ -598,7 +598,9 @@ void pf_lldp_get_chassis_id (pnet_t * net, pf_lldp_chassis_id_t * p_chassis_id)
       pf_cmina_get_device_macaddr (net);
    char station_name[PNET_STATION_NAME_MAX_SIZE]; /** Terminated */
 
-   if (net->interface.name_of_device_mode.mode == PF_LLDP_NAME_OF_DEVICE_MODE_LEGACY)
+   if (
+      net->pf_interface.name_of_device_mode.mode ==
+      PF_LLDP_NAME_OF_DEVICE_MODE_LEGACY)
    {
       /*
        * FIXME: Use of pf_cmina_get_station_name() is not thread-safe.
@@ -662,7 +664,9 @@ void pf_lldp_get_port_id (
    const pnet_ethaddr_t * device_mac_address =
       pf_cmina_get_device_macaddr (net);
 
-   if (net->interface.name_of_device_mode.mode == PF_LLDP_NAME_OF_DEVICE_MODE_LEGACY)
+   if (
+      net->pf_interface.name_of_device_mode.mode ==
+      PF_LLDP_NAME_OF_DEVICE_MODE_LEGACY)
    {
       snprintf (
          p_port_id->string,

src/device/pf_pdport.c

@@ -559,10 +559,10 @@ int pf_pdport_read_ind (
          (slot == PNET_SLOT_DAP_IDENT) &&
          (subslot == PNET_SUBSLOT_DAP_INTERFACE_1_IDENT))
       {
-         if (net->interface.name_of_device_mode.active == true)
+         if (net->pf_interface.name_of_device_mode.active == true)
          {
             pf_put_pd_interface_adj (
-               net->interface.name_of_device_mode.mode,
+               net->pf_interface.name_of_device_mode.mode,
                PNET_SUBSLOT_DAP_INTERFACE_1_IDENT,
                true,
                p_read_res,
@@ -1014,14 +1014,14 @@ static int pf_pdport_write_interface_adj (
    pf_get_interface_adjust (
       &get_info,
       &pos,
-      &net->interface.name_of_device_mode.mode);
-   net->interface.name_of_device_mode.active = true;
+      &net->pf_interface.name_of_device_mode.mode);
+   net->pf_interface.name_of_device_mode.active = true;
 
    LOG_INFO (
       PNET_LOG,
       "PDPORT(%d): PD interface adjust. PLC is setting LLDP mode: %s\n",
       __LINE__,
-      net->interface.name_of_device_mode.mode ==
+      net->pf_interface.name_of_device_mode.mode ==
             PF_LLDP_NAME_OF_DEVICE_MODE_STANDARD
          ? "Standard"
          : "Legacy");

src/device/pf_port.c

@@ -89,7 +89,7 @@ int pf_port_get_next (pf_port_iterator_t * p_iterator)
 pf_port_t * pf_port_get_state (pnet_t * net, int loc_port_num)
 {
    CC_ASSERT (loc_port_num > 0 && loc_port_num <= PNET_MAX_PORT);
-   return &net->interface.port[loc_port_num - 1];
+   return &net->pf_interface.port[loc_port_num - 1];
 }
 
 const pnet_port_cfg_t * pf_port_get_config (pnet_t * net, int loc_port_num)
@@ -132,7 +132,7 @@ int pf_port_get_port_number (pnet_t * net, pnal_eth_handle_t * eth_handle)
 
    for (loc_port_num = 1; loc_port_num <= PNET_MAX_PORT; loc_port_num++)
    {
-      if (net->interface.port[loc_port_num - 1].eth_handle == eth_handle)
+      if (net->pf_interface.port[loc_port_num - 1].eth_handle == eth_handle)
       {
          return loc_port_num;
       }

src/device/pnet_api.c

@@ -54,9 +54,9 @@ int pnet_init_only (pnet_t * net, const pnet_cfg_t * p_cfg)
    pf_dcp_exit (net); /* Prepare for re-init. */
    pf_dcp_init (net); /* Start DCP */
    pf_port_init (net);
-   net->interface.name_of_device_mode.mode =
+   net->pf_interface.name_of_device_mode.mode =
       PF_LLDP_NAME_OF_DEVICE_MODE_STANDARD;
-   net->interface.name_of_device_mode.active = false;
+   net->pf_interface.name_of_device_mode.active = false;
    pf_lldp_init (net);
    pf_pdport_init (net);
 

src/pf_types.h

@@ -2817,7 +2817,7 @@ struct pnet
          pf_lldp_name_of_device_mode_t mode;
       } name_of_device_mode;
       pf_port_t port[PNET_MAX_PORT];
-   } interface;
+   } pf_interface;
 };
 
 /**