Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Pipes
[vpp.git]
/
src
/
vnet
/
ethernet
/
interface.c
diff --git
a/src/vnet/ethernet/interface.c
b/src/vnet/ethernet/interface.c
index
3e78a49
..
e39ae7b
100644
(file)
--- a/
src/vnet/ethernet/interface.c
+++ b/
src/vnet/ethernet/interface.c
@@
-91,7
+91,8
@@
ethernet_build_rewrite (vnet_main_t * vnm,
u8 *rewrite = NULL;
u8 is_p2p = 0;
u8 *rewrite = NULL;
u8 is_p2p = 0;
- if (sub_sw->type == VNET_SW_INTERFACE_TYPE_P2P)
+ if ((sub_sw->type == VNET_SW_INTERFACE_TYPE_P2P) ||
+ (sub_sw->type == VNET_SW_INTERFACE_TYPE_PIPE))
is_p2p = 1;
if (sub_sw != sup_sw)
{
is_p2p = 1;
if (sub_sw != sup_sw)
{
@@
-197,7
+198,8
@@
ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
adj = adj_get (ai);
vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
adj = adj_get (ai);
vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
- if (si->type == VNET_SW_INTERFACE_TYPE_P2P)
+ if ((si->type == VNET_SW_INTERFACE_TYPE_P2P) ||
+ (si->type == VNET_SW_INTERFACE_TYPE_PIPE))
{
default_update_adjacency (vnm, sw_if_index, ai);
}
{
default_update_adjacency (vnm, sw_if_index, ai);
}
@@
-300,14
+302,11
@@
ethernet_register_interface (vnet_main_t * vnm,
ETHERNET_MIN_PACKET_BYTES;
hi->max_packet_bytes = hi->max_supported_packet_bytes =
ETHERNET_MAX_PACKET_BYTES;
ETHERNET_MIN_PACKET_BYTES;
hi->max_packet_bytes = hi->max_supported_packet_bytes =
ETHERNET_MAX_PACKET_BYTES;
- hi->per_packet_overhead_bytes =
- /* preamble */ 8 + /* inter frame gap */ 12;
/* Standard default ethernet MTU. */
/* Standard default ethernet MTU. */
-
hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000
;
+
vnet_sw_interface_set_mtu (vnm, hi->sw_if_index, 9000)
;
clib_memcpy (ei->address, address, sizeof (ei->address));
clib_memcpy (ei->address, address, sizeof (ei->address));
- vec_free (hi->hw_address);
vec_add (hi->hw_address, address, sizeof (ei->address));
if (error)
vec_add (hi->hw_address, address, sizeof (ei->address));
if (error)
@@
-344,6
+343,7
@@
ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index)
}
}
pool_put_index (em->vlan_pool, main_intf->dot1q_vlans);
}
}
pool_put_index (em->vlan_pool, main_intf->dot1q_vlans);
+ main_intf->dot1q_vlans = 0;
}
if (main_intf->dot1ad_vlans)
{
}
if (main_intf->dot1ad_vlans)
{
@@
-356,6
+356,7
@@
ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index)
}
}
pool_put_index (em->vlan_pool, main_intf->dot1ad_vlans);
}
}
pool_put_index (em->vlan_pool, main_intf->dot1ad_vlans);
+ main_intf->dot1ad_vlans = 0;
}
vnet_delete_hw_interface (vnm, hw_if_index);
}
vnet_delete_hw_interface (vnm, hw_if_index);
@@
-619,6
+620,10
@@
vnet_create_loopback_interface (u32 * sw_if_indexp, u8 * mac_address,
{
vnet_sw_interface_t *si = vnet_get_hw_sw_interface (vnm, hw_if_index);
*sw_if_indexp = si->sw_if_index;
{
vnet_sw_interface_t *si = vnet_get_hw_sw_interface (vnm, hw_if_index);
*sw_if_indexp = si->sw_if_index;
+
+ /* By default don't flood to loopbacks, as packets just keep
+ * coming back ... If this loopback becomes a BVI, we'll change it */
+ si->flood_class = VNET_FLOOD_CLASS_NO_FLOOD;
}
return 0;
}
return 0;
@@
-737,29
+742,28
@@
int
vnet_delete_sub_interface (u32 sw_if_index)
{
vnet_main_t *vnm = vnet_get_main ();
vnet_delete_sub_interface (u32 sw_if_index)
{
vnet_main_t *vnm = vnet_get_main ();
+ vnet_sw_interface_t *si;
int rv = 0;
if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
return VNET_API_ERROR_INVALID_SW_IF_INDEX;
int rv = 0;
if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
return VNET_API_ERROR_INVALID_SW_IF_INDEX;
-
- vnet_interface_main_t *im = &vnm->interface_main;
- vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
-
+ si = vnet_get_sw_interface (vnm, sw_if_index);
if (si->type == VNET_SW_INTERFACE_TYPE_SUB ||
if (si->type == VNET_SW_INTERFACE_TYPE_SUB ||
+ si->type == VNET_SW_INTERFACE_TYPE_PIPE ||
si->type == VNET_SW_INTERFACE_TYPE_P2P)
{
si->type == VNET_SW_INTERFACE_TYPE_P2P)
{
- vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+ vnet_interface_main_t *im = &vnm->interface_main;
+ vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
u64 sup_and_sub_key =
((u64) (si->sup_sw_if_index) << 32) | (u64) si->sub.id;
u64 sup_and_sub_key =
((u64) (si->sup_sw_if_index) << 32) | (u64) si->sub.id;
-
- hash_unset
_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key
);
+ hash_unset_mem_free (&im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+ hash_unset
(hi->sub_interface_sw_if_index_by_id, si->sub.id
);
vnet_delete_sw_interface (vnm, sw_if_index);
}
else
vnet_delete_sw_interface (vnm, sw_if_index);
}
else
- {
- rv = VNET_API_ERROR_INVALID_SUB_SW_IF_INDEX;
- }
+ rv = VNET_API_ERROR_INVALID_SUB_SW_IF_INDEX;
+
return rv;
}
return rv;
}