diff options
Diffstat (limited to 'vnet/vnet/vxlan-gpe')
| -rw-r--r-- | vnet/vnet/vxlan-gpe/decap.c | 6 | ||||
| -rw-r--r-- | vnet/vnet/vxlan-gpe/vxlan_gpe.c | 2 | ||||
| -rw-r--r-- | vnet/vnet/vxlan-gpe/vxlan_gpe.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/vnet/vnet/vxlan-gpe/decap.c b/vnet/vnet/vxlan-gpe/decap.c index aed5857d0b1..870871e7de6 100644 --- a/vnet/vnet/vxlan-gpe/decap.c +++ b/vnet/vnet/vxlan-gpe/decap.c @@ -142,8 +142,8 @@ vxlan_gpe_input (vlib_main_t * vm, error0 = 0; error1 = 0; - next0 = (iuvn0->vxlan.protocol < VXLAN_GPE_INPUT_N_NEXT) ? iuvn0->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP; - next1 = (iuvn1->vxlan.protocol < VXLAN_GPE_INPUT_N_NEXT) ? iuvn1->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP; + next0 = (iuvn0->vxlan.protocol < node->n_next_nodes) ? iuvn0->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP; + next1 = (iuvn1->vxlan.protocol < node->n_next_nodes) ? iuvn1->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP; @@ -328,7 +328,7 @@ vxlan_gpe_input (vlib_main_t * vm, tunnel_index0 = ~0; error0 = 0; - next0 = (iuvn0->vxlan.protocol < VXLAN_GPE_INPUT_N_NEXT) ? iuvn0->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP; + next0 = (iuvn0->vxlan.protocol < node->n_next_nodes) ? iuvn0->vxlan.protocol : VXLAN_GPE_INPUT_NEXT_DROP; key0.local = iuvn0->ip4.dst_address.as_u32; key0.remote = iuvn0->ip4.src_address.as_u32; diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.c b/vnet/vnet/vxlan-gpe/vxlan_gpe.c index ef242d0bb8f..bee6e7c9243 100644 --- a/vnet/vnet/vxlan-gpe/vxlan_gpe.c +++ b/vnet/vnet/vxlan-gpe/vxlan_gpe.c @@ -300,8 +300,6 @@ static uword unformat_gpe_decap_next (unformat_input_t * input, va_list * args) *result = VXLAN_GPE_INPUT_NEXT_IP6_INPUT; else if (unformat (input, "ethernet")) *result = VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT; - else if (unformat (input, "nsh")) - *result = VXLAN_GPE_INPUT_NEXT_NSH_INPUT; else if (unformat (input, "%d", &tmp)) *result = tmp; else diff --git a/vnet/vnet/vxlan-gpe/vxlan_gpe.h b/vnet/vnet/vxlan-gpe/vxlan_gpe.h index 4c2ac444e34..a51e0b31e3e 100644 --- a/vnet/vnet/vxlan-gpe/vxlan_gpe.h +++ b/vnet/vnet/vxlan-gpe/vxlan_gpe.h @@ -76,8 +76,7 @@ typedef struct { _(DROP, "error-drop") \ _(IP4_INPUT, "ip4-input") \ _(IP6_INPUT, "ip6-input") \ -_(ETHERNET_INPUT, "ethernet-input") \ -_(NSH_INPUT, "nsh-input") +_(ETHERNET_INPUT, "ethernet-input") typedef enum { #define _(s,n) VXLAN_GPE_INPUT_NEXT_##s, |