vlib_put_frame_to_node (vm, hw->output_node_index, f);
- sif->last_lacpdu_time = vlib_time_now (vm);
+ sif->last_lacpdu_time = vlib_time_now (lm->vlib_main);
}
/*
void
lacp_send_lacp_pdu (vlib_main_t * vm, slave_if_t * sif)
{
- lacp_main_t *lm = &lacp_main;
-
if (sif->mode != BOND_MODE_LACP)
{
lacp_stop_timer (&sif->periodic_timer);
default:
ASSERT (0);
}
-
- lacp_start_periodic_timer (lm->vlib_main, sif, sif->is_long_timeout ?
- LACP_SLOW_PERIODIC_TIMER :
- LACP_FAST_PERIODIC_TIMER);
}
void
/* Create the ethernet lacp packet template */
- memset (&h, 0, sizeof (h));
+ clib_memset (&h, 0, sizeof (h));
memcpy (h.ethernet.dst_address, dst, sizeof (h.ethernet.dst_address));
/* Create the ethernet marker protocol packet template */
- memset (&m, 0, sizeof (m));
+ clib_memset (&m, 0, sizeof (m));
memcpy (m.ethernet.dst_address, dst, sizeof (m.ethernet.dst_address));
{
if (sif->lacp_enabled)
{
- lacp_init_state_machines (vm, sif);
lacp_init_neighbor (sif, sif->actor_admin.system,
ntohs (sif->actor_admin.port_number),
ntohs (sif->actor_admin.key));
+ lacp_init_state_machines (vm, sif);
}
}
}
slave_if_t *sif;
vnet_sw_interface_t *sw;
vlib_main_t *vm = lm->vlib_main;
- vnet_interface_main_t *im = &vnm->interface_main;
- sw = pool_elt_at_index (im->sw_interfaces, hw_if_index);
+ sw = vnet_get_hw_sw_interface (vnm, hw_if_index);
sif = bond_get_slave_by_sw_if_index (sw->sw_if_index);
if (sif)
{
{
if (sif->lacp_enabled)
{
- lacp_init_state_machines (vm, sif);
lacp_init_neighbor (sif, sif->actor_admin.system,
ntohs (sif->actor_admin.port_number),
ntohs (sif->actor_admin.key));
+ lacp_init_state_machines (vm, sif);
}
}
}