X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_glean.c;h=65ccda1f5b8d056239a5db3bf38397d8b337bb45;hb=282872127bbeee6ae59ab3f885c09bad601ee0cc;hp=41bc4c9f68d4f526dc833f19ea06fccb25fde84b;hpb=2303cb181b51f63c909cd506125c1f832432865a;p=vpp.git

diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c
index 41bc4c9f68d..65ccda1f5b8 100644
--- a/src/vnet/adj/adj_glean.c
+++ b/src/vnet/adj/adj_glean.c
@@ -24,19 +24,19 @@
  */
 static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
 
-static inline vlib_node_registration_t*
+static inline u32
 adj_get_glean_node (fib_protocol_t proto)
 {
     switch (proto) {
     case FIB_PROTOCOL_IP4:
-	return (&ip4_glean_node);
+	return (ip4_glean_node.index);
     case FIB_PROTOCOL_IP6:
-	return (&ip6_glean_node);
+	return (ip6_glean_node.index);
     case FIB_PROTOCOL_MPLS:
 	break;
     }
     ASSERT(0);
-    return (NULL);
+    return (~0);
 }
 
 /*
@@ -63,6 +63,7 @@ adj_glean_add_or_lock (fib_protocol_t proto,
 	adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN;
 	adj->ia_nh_proto = proto;
         adj->ia_link = linkt;
+        adj->ia_node_index = adj_get_glean_node(proto);
 	adj_gleans[proto][sw_if_index] = adj_get_index(adj);
 
 	if (NULL != nh_addr)
@@ -77,8 +78,8 @@ adj_glean_add_or_lock (fib_protocol_t proto,
 	adj->rewrite_header.sw_if_index = sw_if_index;
 	adj->rewrite_header.data_bytes = 0;
         adj->rewrite_header.max_l3_packet_bytes =
-            vnet_sw_interface_get_mtu(vnet_get_main(), sw_if_index, VLIB_TX);
-
+	  vnet_sw_interface_get_mtu(vnet_get_main(), sw_if_index,
+                                    vnet_link_to_mtu(linkt));
         adj_lock(adj_get_index(adj));
 
 	vnet_update_adjacency_for_sw_interface(vnet_get_main(),
@@ -91,6 +92,8 @@ adj_glean_add_or_lock (fib_protocol_t proto,
         adj_lock(adj_get_index(adj));
     }
 
+    adj_delegate_adj_created(adj);
+
     return (adj_get_index(adj));
 }
 
@@ -109,7 +112,7 @@ adj_glean_update_rewrite (adj_index_t 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,
+                                  adj->ia_node_index,
                                   VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
                                   &adj->rewrite_header,
                                   sizeof (adj->rewrite_data));
@@ -146,8 +149,7 @@ adj_glean_interface_state_change (vnet_main_t * vnm,
     fib_protocol_t proto;
     ip_adjacency_t *adj;
 
-
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    FOR_EACH_FIB_IP_PROTOCOL(proto)
     {
 	if (sw_if_index >= vec_len(adj_gleans[proto]) ||
 	    ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
@@ -173,12 +175,14 @@ VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_glean_interface_state_change);
  * @brief Invoked on each SW interface of a HW interface when the
  * HW interface state changes
  */
-static void
+static walk_rc_t
 adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
                                       u32 sw_if_index,
                                       void *arg)
 {
     adj_glean_interface_state_change(vnm, sw_if_index, (uword) arg);
+
+    return (WALK_CONTINUE);
 }
 
 /**
@@ -237,7 +241,7 @@ adj_glean_interface_delete (vnet_main_t * vnm,
 	return (NULL);
     }
 
-    for (proto = FIB_PROTOCOL_IP4; proto <= FIB_PROTOCOL_IP6; proto++)
+    FOR_EACH_FIB_IP_PROTOCOL(proto)
     {
 	if (sw_if_index >= vec_len(adj_gleans[proto]) ||
 	    ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])