Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Trivial: Cleanup some typos.
[vpp.git]
/
src
/
vnet
/
geneve
/
geneve.c
diff --git
a/src/vnet/geneve/geneve.c
b/src/vnet/geneve/geneve.c
index
6bc4b67
..
ac097f9
100644
(file)
--- a/
src/vnet/geneve/geneve.c
+++ b/
src/vnet/geneve/geneve.c
@@
-82,14
+82,6
@@
format_geneve_name (u8 * s, va_list * args)
return format (s, "geneve_tunnel%d", dev_instance);
}
return format (s, "geneve_tunnel%d", dev_instance);
}
-static uword
-dummy_interface_tx (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
- clib_warning ("you shouldn't be here, leaking buffers...");
- return frame->n_vectors;
-}
-
static clib_error_t *
geneve_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
{
static clib_error_t *
geneve_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
{
@@
-105,7
+97,6
@@
VNET_DEVICE_CLASS (geneve_device_class, static) = {
.name = "GENEVE",
.format_device_name = format_geneve_name,
.format_tx_trace = format_geneve_encap_trace,
.name = "GENEVE",
.format_device_name = format_geneve_name,
.format_tx_trace = format_geneve_encap_trace,
- .tx_function = dummy_interface_tx,
.admin_up_down_function = geneve_interface_admin_up_down,
};
/* *INDENT-ON* */
.admin_up_down_function = geneve_interface_admin_up_down,
};
/* *INDENT-ON* */
@@
-360,12
+351,6
@@
mcast_shared_remove (ip46_address_t * remote)
hash_unset_mem_free (&geneve_main.mcast_shared, remote);
}
hash_unset_mem_free (&geneve_main.mcast_shared, remote);
}
-static inline fib_protocol_t
-fib_ip_proto (bool is_ip6)
-{
- return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-}
-
int vnet_geneve_add_del_tunnel
(vnet_geneve_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
{
int vnet_geneve_add_del_tunnel
(vnet_geneve_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
{
@@
-465,6
+450,11
@@
int vnet_geneve_add_del_tunnel
hi = vnet_get_hw_interface (vnm, hw_if_index);
}
hi = vnet_get_hw_interface (vnm, hw_if_index);
}
+ /* Set geneve tunnel output node */
+ u32 encap_index = !is_ip6 ?
+ geneve4_encap_node.index : geneve6_encap_node.index;
+ vnet_set_interface_output_node (vnm, hw_if_index, encap_index);
+
t->hw_if_index = hw_if_index;
t->sw_if_index = sw_if_index = hi->sw_if_index;
t->hw_if_index = hw_if_index;
t->sw_if_index = sw_if_index = hi->sw_if_index;
@@
-484,8
+474,6
@@
int vnet_geneve_add_del_tunnel
fib_node_init (&t->node, FIB_NODE_TYPE_GENEVE_TUNNEL);
fib_prefix_t tun_remote_pfx;
fib_node_init (&t->node, FIB_NODE_TYPE_GENEVE_TUNNEL);
fib_prefix_t tun_remote_pfx;
- u32 encap_index = !is_ip6 ?
- geneve4_encap_node.index : geneve6_encap_node.index;
vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx);
vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL;
fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx);
@@
-576,9
+564,6
@@
int vnet_geneve_add_del_tunnel
flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER;
}
flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER;
}
- /* Set geneve tunnel output node */
- hi->output_node_index = encap_index;
-
vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class =
flood_class;
}
vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class =
flood_class;
}
@@
-596,8
+581,8
@@
int vnet_geneve_add_del_tunnel
si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
/* make sure tunnel is removed from l2 bd or xconnect */
si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
/* make sure tunnel is removed from l2 bd or xconnect */
- set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
0, 0,
- 0);
+ set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+
L2_BD_PORT_TYPE_NORMAL, 0,
0);
vec_add1 (vxm->free_geneve_tunnel_hw_if_indices, t->hw_if_index);
vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
vec_add1 (vxm->free_geneve_tunnel_hw_if_indices, t->hw_if_index);
vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;