ip: refactor ip4_mtrie to use atomic store-release

[vpp.git] / src / vnet / ip / ip6_neighbor.c

diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
old mode 100755 (executable)
new mode 100644 (file)
index 4f9e082..071d3eb
--- a/src/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -342,31 +342,19 @@ format_ip6_neighbor_ip6_entry (u8 * s, va_list * va)
   ip6_neighbor_t *n = va_arg (*va, ip6_neighbor_t *);
   vnet_main_t *vnm = vnet_get_main ();
   vnet_sw_interface_t *si;
-  u8 *flags = 0;
 
   if (!n)
     return format (s, "%=12s%=45s%=6s%=20s%=40s", "Time", "Address", "Flags",
                   "Link layer", "Interface");
 
-  if (n->flags & IP_NEIGHBOR_FLAG_DYNAMIC)
-    flags = format (flags, "D");
-
-  if (n->flags & IP_NEIGHBOR_FLAG_STATIC)
-    flags = format (flags, "S");
-
-  if (n->flags & IP_NEIGHBOR_FLAG_NO_FIB_ENTRY)
-    flags = format (flags, "N");
-
   si = vnet_get_sw_interface (vnm, n->key.sw_if_index);
-  s = format (s, "%=12U%=45U%=6s%=20U%=40U",
-             format_vlib_time, vm, n->time_last_updated,
-             format_ip6_address, &n->key.ip6_address,
-             flags ? (char *) flags : "",
-             format_mac_address_t, &n->mac,
-             format_vnet_sw_interface_name, vnm, si);
-
-  vec_free (flags);
-  return s;
+
+  return format (s, "%=12U%=45U%=6U%=20U%=40U",
+                format_vlib_time, vm, n->time_last_updated,
+                format_ip6_address, &n->key.ip6_address,
+                format_ip_neighbor_flags, n->flags,
+                format_mac_address_t, &n->mac,
+                format_vnet_sw_interface_name, vnm, si);
 }
 
 static void
@@ -2701,7 +2689,7 @@ ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm,
          clib_memcpy (a->link_layer_address, eth_if0->address, 6);
 
          /* fill in default link-local address  (this may be overridden) */
-         ip6_link_local_address_from_ethernet_address
+         ip6_link_local_address_from_ethernet_mac_address
            (&a->link_local_address, eth_if0->address);
 
          mhash_init (&a->address_to_prefix_index, sizeof (uword),