Fix name confusion for gre interface index.
Change from free_vxlan_tunnel_hw_if_indices to free_gre_tunnel_hw_if_indices.
Change-Id: I32f04f2b6b28fcf80d2fc0c37c67e343317dce7c
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
diff --git a/vnet/vnet/gre/gre.h b/vnet/vnet/gre/gre.h
index 6cbe4aa..d44d8d9 100644
--- a/vnet/vnet/gre/gre.h
+++ b/vnet/vnet/gre/gre.h
@@ -69,7 +69,7 @@
uword * tunnel_by_key;
/* Free vlib hw_if_indices */
- u32 * free_vxlan_tunnel_hw_if_indices;
+ u32 * free_gre_tunnel_hw_if_indices;
/* Mapping from sw_if_index to tunnel index */
u32 * tunnel_index_by_sw_if_index;
diff --git a/vnet/vnet/gre/interface.c b/vnet/vnet/gre/interface.c
index ae59b24..a573674 100644
--- a/vnet/vnet/gre/interface.c
+++ b/vnet/vnet/gre/interface.c
@@ -65,12 +65,12 @@
pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
memset (t, 0, sizeof (*t));
- if (vec_len (gm->free_vxlan_tunnel_hw_if_indices) > 0) {
+ if (vec_len (gm->free_gre_tunnel_hw_if_indices) > 0) {
vnet_interface_main_t * im = &vnm->interface_main;
- hw_if_index = gm->free_vxlan_tunnel_hw_if_indices
- [vec_len (gm->free_vxlan_tunnel_hw_if_indices)-1];
- _vec_len (gm->free_vxlan_tunnel_hw_if_indices) -= 1;
+ hw_if_index = gm->free_gre_tunnel_hw_if_indices
+ [vec_len (gm->free_gre_tunnel_hw_if_indices)-1];
+ _vec_len (gm->free_gre_tunnel_hw_if_indices) -= 1;
hi = vnet_get_hw_interface (vnm, hw_if_index);
hi->dev_instance = t - gm->tunnels;
@@ -133,7 +133,7 @@
vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */);
/* make sure tunnel is removed from l2 bd or xconnect */
set_int_l2_mode(gm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
- vec_add1 (gm->free_vxlan_tunnel_hw_if_indices, t->hw_if_index);
+ vec_add1 (gm->free_gre_tunnel_hw_if_indices, t->hw_if_index);
gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
hash_unset (gm->tunnel_by_key, key);