switching_active = 1;
vec_del1 (bif->active_slaves, i);
- hash_unset (bif->active_slave_by_sw_if_index, sif->sw_if_index);
/* We got a new slave just becoming active? */
if ((vec_len (bif->active_slaves) >= 1) &&
{
bond_if_t *bif;
bond_main_t *bm = &bond_main;
+ int i;
+ uword p;
bif = bond_get_master_by_dev_instance (sif->bif_dev_instance);
clib_spinlock_lock_if_init (&bif->lockp);
- if (!hash_get (bif->active_slave_by_sw_if_index, sif->sw_if_index))
- {
- hash_set (bif->active_slave_by_sw_if_index, sif->sw_if_index,
- sif->sw_if_index);
- vec_add1 (bif->active_slaves, sif->sw_if_index);
-
- /* First slave becomes active? */
- if ((vec_len (bif->active_slaves) == 1) &&
- (bif->mode == BOND_MODE_ACTIVE_BACKUP))
- vlib_process_signal_event (bm->vlib_main, bond_process_node.index,
- BOND_SEND_GARP_NA, bif->hw_if_index);
- }
+ vec_foreach_index (i, bif->active_slaves)
+ {
+ p = *vec_elt_at_index (bif->active_slaves, i);
+ if (p == sif->sw_if_index)
+ goto done;
+ }
+
+ vec_add1 (bif->active_slaves, sif->sw_if_index);
+
+ /* First slave becomes active? */
+ if ((vec_len (bif->active_slaves) == 1) &&
+ (bif->mode == BOND_MODE_ACTIVE_BACKUP))
+ vlib_process_signal_event (bm->vlib_main, bond_process_node.index,
+ BOND_SEND_GARP_NA, bif->hw_if_index);
+
+done:
clib_spinlock_unlock_if_init (&bif->lockp);
}