From 59ff918ea5b86112ffc89054aa38107703354585 Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Sun, 29 Dec 2019 23:55:18 +0000
Subject: tunnel: Common types for IP tunnels

Type: refactor

Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: I18dcdb7af3e327f6cacdbcb1e52b89f13d6ba6e2
---
 src/vnet/ipip/ipip_api.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/vnet/ipip/ipip_api.c')

diff --git a/src/vnet/ipip/ipip_api.c b/src/vnet/ipip/ipip_api.c
index 47ff159b703..4f6aa7f3dbe 100644
--- a/src/vnet/ipip/ipip_api.c
+++ b/src/vnet/ipip/ipip_api.c
@@ -22,7 +22,7 @@
 #include <vnet/ipip/ipip.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip_types_api.h>
-#include <vnet/ipip/ipip_types_api.h>
+#include <vnet/tunnel/tunnel_types_api.h>
 
 #include <vnet/ipip/ipip.api_enum.h>
 #include <vnet/ipip/ipip.api_types.h>
@@ -37,7 +37,7 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp)
   vl_api_ipip_add_tunnel_reply_t *rmp;
   int rv = 0;
   u32 fib_index, sw_if_index = ~0;
-  ipip_tunnel_flags_t flags;
+  tunnel_encap_decap_flags_t flags;
   ip46_address_t src, dst;
   ip46_type_t itype[2];
 
@@ -56,7 +56,7 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp)
       goto out;
     }
 
-  rv = ipip_tunnel_flags_decode (mp->tunnel.flags, &flags);
+  rv = tunnel_encap_decap_flags_decode (mp->tunnel.flags, &flags);
 
   if (rv)
     goto out;
@@ -119,7 +119,7 @@ send_ipip_tunnel_details (ipip_tunnel_t * t, vl_api_ipip_tunnel_dump_t * mp)
     rmp->tunnel.instance = htonl (t->user_instance);
     rmp->tunnel.sw_if_index = htonl (t->sw_if_index);
     rmp->tunnel.dscp = ip_dscp_encode(t->dscp);
-    rmp->tunnel.flags = ipip_tunnel_flags_encode(t->flags);
+    rmp->tunnel.flags = tunnel_encap_decap_flags_encode(t->flags);
   }));
     /* *INDENT-ON* */
 }
-- 
cgit 1.2.3-korg