From: Neale Ranns <nranns@cisco.com>
Date: Thu, 28 Mar 2019 08:59:12 +0000 (+0000)
Subject: IPSEC: fix build breakage from ships in the night merges
X-Git-Tag: v19.04-rc1~112
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F18561%2F1;p=vpp.git

IPSEC: fix build breakage from ships in the night merges

Change-Id: Iec7da9adc970d005cd7d3d42839b5e51b0b5f5c3
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c
index 304c52eac7c..af61178fbc8 100644
--- a/src/vnet/ipsec/ipsec_if.c
+++ b/src/vnet/ipsec/ipsec_if.c
@@ -69,11 +69,15 @@ ipsec_if_tunnel_stack (adj_index_t ai)
 
       sa = ipsec_sa_get (it->output_sa_index);
 
+      /* *INDENT-OFF* */
       fib_prefix_t pfx = {
 	.fp_addr = sa->tunnel_dst_addr,
-	.fp_len = (sa->is_tunnel_ip6 ? 128 : 32),
-	.fp_proto = (sa->is_tunnel_ip6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4),
+	.fp_len = (ipsec_sa_is_set_IS_TUNNEL_V6(sa) ? 128 : 32),
+	.fp_proto = (ipsec_sa_is_set_IS_TUNNEL_V6(sa) ?
+                     FIB_PROTOCOL_IP6 :
+                     FIB_PROTOCOL_IP4),
       };
+      /* *INDENT-ON* */
 
       adj_midchain_delegate_stack (ai, sa->tx_fib_index, &pfx);
     }