acl-plugin: VPP-1230: fix the "undefined symbol" error for acl_main when using the...

[vpp.git] / src / vnet / adj / adj_nbr.c

diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index fc7a7fc..dcf3cb1 100644 (file)
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -968,21 +968,6 @@ VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
     .function = adj_nbr_show,
 };
 
-static ip46_type_t
-adj_proto_to_46 (fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-       return (IP46_TYPE_IP4);
-    case FIB_PROTOCOL_IP6:
-       return (IP46_TYPE_IP6);
-    default:
-       return (IP46_TYPE_IP4);
-    }
-    return (IP46_TYPE_IP4);
-}
-
 u8*
 format_adj_nbr_incomplete (u8* s, va_list *ap)
 {
@@ -996,10 +981,8 @@ format_adj_nbr_incomplete (u8* s, va_list *ap)
                 format_ip46_address, &adj->sub_type.nbr.next_hop,
                adj_proto_to_46(adj->ia_nh_proto));
     s = format (s, " %U",
-                format_vnet_sw_interface_name,
-                vnm,
-                vnet_get_sw_interface(vnm,
-                                      adj->rewrite_header.sw_if_index));
+                format_vnet_sw_if_index_name,
+                vnm, adj->rewrite_header.sw_if_index);
 
     return (s);
 }