diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-04-06 09:18:11 -0700 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2018-04-12 06:53:38 -0400 |
| commit | 756cd9441752fc8f84104c9ee19099506ba89f85 (patch) | |
| tree | da9afcf137e7cb540713d39a3c5df2b0fdd8ead2 /src/vnet/gre | |
| parent | 58c711a196d9b178bfe6190964a7df92145cf949 (diff) | |
Fixes for 'make UNATTENDED=yes CC=clang CXX=clang verify'
Change-Id: I994649761fe2e66e12ae0e49a84fb1d0a966ddfb
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/gre')
| -rw-r--r-- | src/vnet/gre/gre.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/vnet/gre/gre.c b/src/vnet/gre/gre.c index 2918f3541fd..0b8d2cc8df7 100644 --- a/src/vnet/gre/gre.c +++ b/src/vnet/gre/gre.c @@ -320,13 +320,10 @@ gre_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) typedef enum { - GRE_ENCAP_NEXT_DROP, GRE_ENCAP_NEXT_L2_MIDCHAIN, GRE_ENCAP_N_NEXT, } gre_encap_next_t; -#define NEXT_IDX (GRE_ENCAP_NEXT_L2_MIDCHAIN) - /** * @brief TX function. Only called for L2 payload including TEB or ERSPAN. * L3 traffic uses the adj-midchains. @@ -353,7 +350,7 @@ gre_interface_tx (vlib_main_t * vm, n_left_from = frame->n_vectors; /* Speculatively send the first buffer to the last disposition we used */ - next_index = node->cached_next_index; + next_index = GRE_ENCAP_NEXT_L2_MIDCHAIN; while (n_left_from > 0) { @@ -447,10 +444,6 @@ gre_interface_tx (vlib_main_t * vm, tr1->dst = gt1->tunnel_dst.fp_addr; tr1->length = vlib_buffer_length_in_chain (vm, b1); } - - vlib_validate_buffer_enqueue_x2 (vm, node, next_index, - to_next, n_left_to_next, - bi0, bi1, NEXT_IDX, NEXT_IDX); } while (n_left_from > 0 && n_left_to_next > 0) @@ -497,10 +490,6 @@ gre_interface_tx (vlib_main_t * vm, tr->dst = gt0->tunnel_dst.fp_addr; tr->length = vlib_buffer_length_in_chain (vm, b0); } - - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, - to_next, n_left_to_next, - bi0, NEXT_IDX); } vlib_put_next_frame (vm, node, next_index, n_left_to_next); @@ -530,7 +519,6 @@ VLIB_REGISTER_NODE (gre_encap_node) = .error_strings = gre_error_strings, .n_next_nodes = GRE_ENCAP_N_NEXT, .next_nodes = { - [GRE_ENCAP_NEXT_DROP] = "error-drop", [GRE_ENCAP_NEXT_L2_MIDCHAIN] = "adj-l2-midchain", }, }; @@ -644,14 +632,6 @@ gre_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (gre_init); -gre_main_t * -gre_get_main (vlib_main_t * vm) -{ - vlib_call_init_function (vm, gre_init); - return &gre_main; -} - - /* * fd.io coding-style-patch-verification: ON * |