Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vhost-user: avoid per-packet feature arc lookups
[vpp.git]
/
src
/
vnet
/
gre
/
interface.c
diff --git
a/src/vnet/gre/interface.c
b/src/vnet/gre/interface.c
index
0215f9b
..
6be934a
100644
(file)
--- a/
src/vnet/gre/interface.c
+++ b/
src/vnet/gre/interface.c
@@
-281,7
+281,7
@@
vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
return VNET_API_ERROR_IF_ALREADY_EXISTS;
pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
return VNET_API_ERROR_IF_ALREADY_EXISTS;
pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
- memset (t, 0, sizeof (*t));
+
clib_
memset (t, 0, sizeof (*t));
/* Reconcile the real dev_instance and a possible requested instance */
u32 t_idx = t - gm->tunnels; /* tunnel index (or instance) */
/* Reconcile the real dev_instance and a possible requested instance */
u32 t_idx = t - gm->tunnels; /* tunnel index (or instance) */
@@
-423,7
+423,8
@@
vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a,
vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ );
/* make sure tunnel is removed from l2 bd or xconnect */
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);
+ set_int_l2_mode (gm->vlib_main, vnm, MODE_L3, sw_if_index, 0,
+ L2_BD_PORT_TYPE_NORMAL, 0, 0);
gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
if (t->type == GRE_TUNNEL_TYPE_L3)
gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
if (t->type == GRE_TUNNEL_TYPE_L3)
@@
-605,7
+606,7
@@
create_gre_tunnel_command_fn (vlib_main_t * vm,
goto done;
}
goto done;
}
- memset (a, 0, sizeof (*a));
+
clib_
memset (a, 0, sizeof (*a));
a->is_add = is_add;
a->outer_fib_id = outer_fib_id;
a->tunnel_type = t_type;
a->is_add = is_add;
a->outer_fib_id = outer_fib_id;
a->tunnel_type = t_type;