Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
L2 BD: introduce a BD interface on which to send UU packets
[vpp.git]
/
src
/
vnet
/
vxlan-gpe
/
vxlan_gpe.c
diff --git
a/src/vnet/vxlan-gpe/vxlan_gpe.c
b/src/vnet/vxlan-gpe/vxlan_gpe.c
index
af5dd19
..
ac3e178
100644
(file)
--- a/
src/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/
src/vnet/vxlan-gpe/vxlan_gpe.c
@@
-456,12
+456,6
@@
mcast_shared_remove (ip46_address_t * remote)
hash_unset_mem_free (&vxlan_gpe_main.mcast_shared, remote);
}
hash_unset_mem_free (&vxlan_gpe_main.mcast_shared, remote);
}
-static inline fib_protocol_t
-fib_ip_proto (bool is_ip6)
-{
- return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
-}
-
/**
* @brief Add or Del a VXLAN GPE tunnel
*
/**
* @brief Add or Del a VXLAN GPE tunnel
*
@@
-637,8
+631,8
@@
int vnet_vxlan_gpe_add_del_tunnel
else
{
/* Multicast tunnel -
else
{
/* Multicast tunnel -
- * as the same mcast group can be used for mutiple mcast tunnels
- * with different VNIs, create the output fib adj
e
cency only if
+ * as the same mcast group can be used for mu
l
tiple mcast tunnels
+ * with different VNIs, create the output fib adj
a
cency only if
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
* it does not already exist
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
@@
-719,8
+713,8
@@
int vnet_vxlan_gpe_add_del_tunnel
vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */ );
vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, t->sw_if_index);
si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */ );
vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, t->sw_if_index);
si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
- set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
0, 0,
- 0);
+ set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0,
+
L2_BD_PORT_TYPE_NORMAL, 0,
0);
vec_add1 (ngm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
ngm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
vec_add1 (ngm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index);
ngm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
@@
-978,7
+972,7
@@
done:
* center or be separated geographically as long as they are reachable
* through the underlay L3 network.
*
* center or be separated geographically as long as they are reachable
* through the underlay L3 network.
*
- * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE se
n
gment.
+ * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE segment.
*
* @cliexpar
* Example of how to create a VXLAN-GPE Tunnel:
*
* @cliexpar
* Example of how to create a VXLAN-GPE Tunnel:
@@
-1136,7
+1130,7
@@
set_ip4_vxlan_gpe_bypass (vlib_main_t * vm,
* ip4-lookup [2]
* @cliexend
*
* ip4-lookup [2]
* @cliexend
*
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enab
l
ed on an interface:
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...
@@
-1193,7
+1187,7
@@
set_ip6_vxlan_gpe_bypass (vlib_main_t * vm,
* ip6-lookup [2]
* @cliexend
*
* ip6-lookup [2]
* @cliexend
*
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enab
l
ed on an interface:
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...
* @cliexstart{show ip interface features GigabitEthernet2/0/0}
* IP feature paths configured on GigabitEthernet2/0/0...
* ...