Revert "Allow interface types to override glean adjacency behaivour"

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

diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c
index 09e6c0a..82023f1 100644 (file)
--- a/src/vnet/adj/adj_glean.c
+++ b/src/vnet/adj/adj_glean.c
@@ -68,49 +68,24 @@ adj_glean_add_or_lock (fib_protocol_t proto,
            adj->sub_type.glean.receive_addr = *nh_addr;
        }
 
-       adj->rewrite_header.sw_if_index = sw_if_index;
        adj->rewrite_header.data_bytes = 0;
-        adj_lock(adj_get_index(adj));
 
-       vnet_update_adjacency_for_sw_interface(vnet_get_main(),
-                                               sw_if_index,
-                                               adj_get_index(adj));
+       vnet_rewrite_for_sw_interface(vnet_get_main(),
+                                     adj_fib_proto_2_nd(proto),
+                                     sw_if_index,
+                                     adj_get_glean_node(proto)->index,
+                                     VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
+                                     &adj->rewrite_header,
+                                     sizeof (adj->rewrite_data));
     }
     else
     {
        adj = adj_get(adj_gleans[proto][sw_if_index]);
-        adj_lock(adj_get_index(adj));
     }
 
-    return (adj_get_index(adj));
-}
-
-/**
- * adj_glean_update_rewrite
- */
-void
-adj_glean_update_rewrite (adj_index_t adj_index)
-{
-    ip_adjacency_t *adj;
+    adj_lock(adj_get_index(adj));
 
-    ASSERT(ADJ_INDEX_INVALID != adj_index);
-
-    adj = adj_get(adj_index);
-
-    vnet_rewrite_for_sw_interface(vnet_get_main(),
-                                  adj_fib_proto_2_nd(adj->ia_nh_proto),
-                                  adj->rewrite_header.sw_if_index,
-                                  adj_get_glean_node(adj->ia_nh_proto)->index,
-                                  VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
-                                  &adj->rewrite_header,
-                                  sizeof (adj->rewrite_data));
-}
-
-adj_index_t
-adj_glean_get (fib_protocol_t proto,
-               u32 sw_if_index)
-{
-    return (adj_gleans[proto][sw_if_index]);
+    return (adj_get_index(adj));
 }
 
 void
@@ -252,17 +227,12 @@ format_adj_glean (u8* s, va_list *ap)
     vnet_main_t * vnm = vnet_get_main();
     ip_adjacency_t * adj = adj_get(index);
 
-    s = format(s, "%U-glean: %U",
-               format_fib_protocol, adj->ia_nh_proto,
-               format_vnet_sw_interface_name,
-               vnm,
-               vnet_get_sw_interface(vnm,
-                                     adj->rewrite_header.sw_if_index));
-    s = format (s, " %U",
-               format_vnet_rewrite,
-               &adj->rewrite_header, sizeof (adj->rewrite_data), 0);
-
-    return (s);
+    return (format(s, "%U-glean: %U",
+                  format_fib_protocol, adj->ia_nh_proto,
+                   format_vnet_sw_interface_name,
+                   vnm,
+                   vnet_get_sw_interface(vnm,
+                                         adj->rewrite_header.sw_if_index)));
 }