diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-09-19 04:55:32 -0700 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2018-09-19 15:53:46 +0000 |
| commit | 2646c80db8d3d1a3cd7555328d5a0038798f861e (patch) | |
| tree | 52269f0ab8207676f719cc670576a5e4b13f86fd /src/vnet/gre/interface.c | |
| parent | a2e212919c9a287681182bb5171e31d94e90d02e (diff) | |
GRE: fix 4o6 and 6o4 adj stacking
Change-Id: I13dc5eab8835c4f3b95906816d42dccfeee8b092
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/gre/interface.c')
| -rw-r--r-- | src/vnet/gre/interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c index cd7f952cce5..0215f9b0860 100644 --- a/src/vnet/gre/interface.c +++ b/src/vnet/gre/interface.c @@ -128,7 +128,9 @@ gre_tunnel_from_fib_node (fib_node_t * node) void gre_tunnel_stack (adj_index_t ai) { + fib_forward_chain_type_t fib_fwd; gre_main_t *gm = &gre_main; + dpo_id_t tmp = DPO_INVALID; ip_adjacency_t *adj; gre_tunnel_t *gt; u32 sw_if_index; @@ -150,9 +152,7 @@ gre_tunnel_stack (adj_index_t ai) return; } - dpo_id_t tmp = DPO_INVALID; - fib_forward_chain_type_t fib_fwd = (FIB_PROTOCOL_IP6 == adj->ia_nh_proto) ? - FIB_FORW_CHAIN_TYPE_UNICAST_IP6 : FIB_FORW_CHAIN_TYPE_UNICAST_IP4; + fib_fwd = fib_forw_chain_type_from_fib_proto (gt->tunnel_dst.fp_proto); fib_entry_contribute_forwarding (gt->fib_entry_index, fib_fwd, &tmp); if (DPO_LOAD_BALANCE == tmp.dpoi_type) |