X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Frewrite.c;h=c8508c4b37a2f84ff857a3425c6a3e5e837b7ec8;hb=e5d34919b;hp=95671b069302d25726eda0a3314fef084be637d7;hpb=4af1a7f938207f713c249270ed98a0c12f72cd3f;p=vpp.git diff --git a/src/vnet/adj/rewrite.c b/src/vnet/adj/rewrite.c index 95671b06930..c8508c4b37a 100644 --- a/src/vnet/adj/rewrite.c +++ b/src/vnet/adj/rewrite.c @@ -53,7 +53,7 @@ format_vnet_rewrite (u8 * s, va_list * args) if (rw->sw_if_index != ~0) { vnet_sw_interface_t *si; - si = vnet_get_sw_interface_safe (vnm, rw->sw_if_index); + si = vnet_get_sw_interface_or_null (vnm, rw->sw_if_index); if (NULL != si) s = format (s, "%U:", format_vnet_sw_interface_name, vnm, si); else @@ -125,32 +125,6 @@ vnet_rewrite_for_sw_interface (vnet_main_t * vnm, vec_free (rewrite); } -void -vnet_rewrite_for_tunnel (vnet_main_t * vnm, - u32 tx_sw_if_index, - u32 rewrite_node_index, - u32 post_rewrite_node_index, - vnet_rewrite_header_t * rw, - u8 * rewrite_data, u32 rewrite_length) -{ - ip_adjacency_t *adj = 0; - /* - * Installed into vnet_buffer(b)->sw_if_index[VLIB_TX] e.g. - * by ip4_rewrite_inline. If the post-rewrite node injects into - * ipX-forward, this will be interpreted as a FIB number. - */ - rw->sw_if_index = tx_sw_if_index; - rw->next_index = vlib_node_add_next (vnm->vlib_main, rewrite_node_index, - post_rewrite_node_index); - /* we can't know at this point */ - rw->max_l3_packet_bytes = (u16) ~ 0; - - ASSERT (rewrite_length < sizeof (adj->rewrite_data)); - /* Leave room for ethernet + VLAN tag */ - vnet_rewrite_set_data_internal (rw, sizeof (adj->rewrite_data), - rewrite_data, rewrite_length); -} - void serialize_vnet_rewrite (serialize_main_t * m, va_list * va) {