vlib_process_signal_event (bm->vlib_main, bond_process_node.index,
BOND_SEND_GARP_NA, bif->hw_if_index);
clib_spinlock_unlock_if_init (&bif->lockp);
-
- if (bif->mode == BOND_MODE_LACP)
- stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
- [sif->sw_if_index], sif->actor.state);
}
/*
slave_if_t *sif2 = bond_get_slave_by_sw_if_index (*s2);
bond_if_t *bif;
- ASSERT (sif1);
- ASSERT (sif2);
+ ALWAYS_ASSERT (sif1);
+ ALWAYS_ASSERT (sif2);
/*
* sort entries according to preference rules:
* 1. biggest weight
done:
clib_spinlock_unlock_if_init (&bif->lockp);
-
- if (bif->mode == BOND_MODE_LACP)
- stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
- [sif->sw_if_index], sif->actor.state);
}
int
return 0;
}
+/*
+ * Manage secondary mac addresses when attaching/detaching a slave.
+ * If adding, copies any secondary addresses from master to slave
+ * If deleting, deletes the master's secondary addresses from the slave
+ *
+ */
+static void
+bond_slave_add_del_mac_addrs (bond_if_t * bif, u32 sif_sw_if_index, u8 is_add)
+{
+ vnet_main_t *vnm = vnet_get_main ();
+ ethernet_interface_t *b_ei;
+ mac_address_t *sec_mac;
+ vnet_hw_interface_t *s_hwif;
+
+ b_ei = ethernet_get_interface (ðernet_main, bif->hw_if_index);
+ if (!b_ei || !b_ei->secondary_addrs)
+ return;
+
+ s_hwif = vnet_get_sup_hw_interface (vnm, sif_sw_if_index);
+
+ vec_foreach (sec_mac, b_ei->secondary_addrs)
+ vnet_hw_interface_add_del_mac_address (vnm, s_hwif->hw_if_index,
+ sec_mac->bytes, is_add);
+}
+
static void
bond_delete_neighbor (vlib_main_t * vm, bond_if_t * bif, slave_if_t * sif)
{
vnet_hw_interface_change_mac_address (vnm, sif_hw->hw_if_index,
sif->persistent_hw_address);
+ /* delete the bond's secondary/virtual mac addrs from the slave */
+ bond_slave_add_del_mac_addrs (bif, sif->sw_if_index, 0 /* is_add */ );
+
+
if ((bif->mode == BOND_MODE_LACP) && bm->lacp_enable_disable)
(*bm->lacp_enable_disable) (vm, bif, sif, 0);
if (bif->mode == BOND_MODE_LACP)
- stat_segment_deregister_state_counter
- (bm->stats[bif->sw_if_index][sif->sw_if_index]);
+ {
+ stat_segment_deregister_state_counter
+ (bm->stats[bif->sw_if_index][sif->sw_if_index].actor_state);
+ stat_segment_deregister_state_counter
+ (bm->stats[bif->sw_if_index][sif->sw_if_index].partner_state);
+ }
pool_put (bm->neighbors, sif);
}
vec_validate (bm->stats[bif->sw_if_index], args->slave);
args->error = stat_segment_register_state_counter
- (name, &bm->stats[bif->sw_if_index][args->slave]);
+ (name, &bm->stats[bif->sw_if_index][args->slave].actor_state);
+ if (args->error != 0)
+ {
+ args->rv = VNET_API_ERROR_INVALID_INTERFACE;
+ vec_free (name);
+ return;
+ }
+
+ vec_reset_length (name);
+ name = format (0, "/if/lacp/%u/%u/partner-state%c", bif->sw_if_index,
+ args->slave, 0);
+ args->error = stat_segment_register_state_counter
+ (name, &bm->stats[bif->sw_if_index][args->slave].partner_state);
vec_free (name);
if (args->error != 0)
{
}
}
+ /* if there are secondary/virtual mac addrs, propagate to the slave */
+ bond_slave_add_del_mac_addrs (bif, sif->sw_if_index, 1 /* is_add */ );
+
if (bif_hw->l2_if_count)
{
ethernet_set_flags (vnm, sif_hw->hw_if_index,