X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_glean.c;h=338d7320d53e279df6669fa4a43c530100dcf184;hb=refs%2Fchanges%2F19%2F22819%2F26;hp=92369116532513f2c3a93d4daf4c3992386cd6c9;hpb=d723161e038d00e59766aa67a6a0dcc350227e4b;p=vpp.git diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c index 92369116532..338d7320d53 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) @@ -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));