ip0->ip6.payload_length =
clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) -
sizeof (ip0->ip6));
- tunnel_encap_fixup_4o6 (flags, (ip4_header_t *) (ip0 + 1), &ip0->ip6);
+ tunnel_encap_fixup_4o6 (flags, b0, (ip4_header_t *) (ip0 + 1), &ip0->ip6);
}
static void
return (gre64_fixup);
if (fproto == FIB_PROTOCOL_IP4 && lt == VNET_LINK_IP4)
return (gre44_fixup);
- if (fproto == FIB_PROTOCOL_IP6 && lt == VNET_LINK_ETHERNET)
+ if (fproto == FIB_PROTOCOL_IP6)
return (grex6_fixup);
- if (fproto == FIB_PROTOCOL_IP4 && lt == VNET_LINK_ETHERNET)
+ if (fproto == FIB_PROTOCOL_IP4)
return (grex4_fixup);
ASSERT (0);
ti = gm->tunnel_index_by_sw_if_index[sw_if_index];
t = pool_elt_at_index (gm->tunnels, ti);
- af = ADJ_FLAG_MIDCHAIN_IP_STACK;
+
+ if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_INNER_HASH)
+ af = ADJ_FLAG_MIDCHAIN_FIXUP_FLOW_HASH;
+ else
+ af = ADJ_FLAG_MIDCHAIN_IP_STACK;
if (VNET_LINK_ETHERNET == adj_get_link_type (ai))
af |= ADJ_FLAG_MIDCHAIN_NO_COUNT;
mgre_mk_complete_walk (adj_index_t ai, void *data)
{
mgre_walk_ctx_t *ctx = data;
+ adj_flags_t af;
+
+ if (ctx->t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_INNER_HASH)
+ af = ADJ_FLAG_MIDCHAIN_FIXUP_FLOW_HASH;
+ else
+ af = ADJ_FLAG_MIDCHAIN_IP_STACK;
adj_nbr_midchain_update_rewrite
(ai, gre_get_fixup (ctx->t->tunnel_dst.fp_proto,
adj_get_link_type (ai)),
uword_to_pointer (ctx->t->flags, void *),
- ADJ_FLAG_MIDCHAIN_IP_STACK,
+ af,
gre_build_rewrite (vnet_get_main (),
ctx->t->sw_if_index,
adj_get_link_type (ai),