From fdff1e6ed540f2a04792fb64e04b0c7862dc2b8c Mon Sep 17 00:00:00 2001 From: "Keith Burns (alagalah)" Date: Wed, 4 May 2016 16:11:38 -0700 Subject: VPP-39 - refactoring of NSH into own folder - common header files and structs used in both GRE and VXLAN-GPE Change-Id: I06d0b773e936fb011408817237059f24a4beb412 Signed-off-by: Keith Burns (alagalah) --- vpp-api-test/vat/api_format.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vpp-api-test/vat/api_format.c') diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c index 4a57d4cb018..548959edb3b 100644 --- a/vpp-api-test/vat/api_format.c +++ b/vpp-api-test/vat/api_format.c @@ -7894,13 +7894,13 @@ static uword unformat_nsh_gre_decap_next u32 tmp; if (unformat (input, "drop")) - *result = NSH_INPUT_NEXT_DROP; + *result = NSH_GRE_INPUT_NEXT_DROP; else if (unformat (input, "ip4")) - *result = NSH_INPUT_NEXT_IP4_INPUT; + *result = NSH_GRE_INPUT_NEXT_IP4_INPUT; else if (unformat (input, "ip6")) - *result = NSH_INPUT_NEXT_IP6_INPUT; + *result = NSH_GRE_INPUT_NEXT_IP6_INPUT; else if (unformat (input, "ethernet")) - *result = NSH_INPUT_NEXT_ETHERNET_INPUT; + *result = NSH_GRE_INPUT_NEXT_ETHERNET_INPUT; else if (unformat (input, "%d", &tmp)) *result = tmp; else @@ -7932,7 +7932,7 @@ static int api_nsh_gre_add_del_tunnel (vat_main_t * vam) u32 c3 = 0; u32 c4 = 0; u32 *tlvs = 0; - u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT; + u32 decap_next_index = NSH_GRE_INPUT_NEXT_IP4_INPUT; u32 tmp; int i; @@ -8084,7 +8084,7 @@ static int api_nsh_vxlan_gpe_add_del_tunnel (vat_main_t * vam) u32 c3 = 0; u32 c4 = 0; u32 *tlvs = 0; - u32 decap_next_index = NSH_INPUT_NEXT_IP4_INPUT; + u32 decap_next_index = NSH_GRE_INPUT_NEXT_IP4_INPUT; u32 vni; u8 vni_set = 0; u32 tmp; -- cgit 1.2.3-korg