Re: [PATCH 1/1] bonding: properly unset current_arp_slave on slave link up

From: Jay Vosburgh
Date: Thu Apr 05 2012 - 12:43:27 EST


Veaceslav Falico <vfalico@xxxxxxxxxx> wrote:

>When a slave comes up, we're unsetting the current_arp_slave without
>removing active flags from it, which can lead to situations where we have
>more than one slave with active flags in active-backup mode.
>
>To avoid this situation we must remove the active flags from a slave before
>removing it as a current_arp_slave.
>
>Signed-off-by: Veaceslav Falico <vfalico@xxxxxxxxxx>

Signed-off-by: Jay Vosburgh <fubar@xxxxxxxxxx>

>---
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index 0c76186..ad731a1 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -3001,7 +3001,11 @@ static void bond_ab_arp_commit(struct bonding *bond, int delta_in_ticks)
> trans_start + delta_in_ticks)) ||
> bond->curr_active_slave != slave) {
> slave->link = BOND_LINK_UP;
>- bond->current_arp_slave = NULL;
>+ if (bond->current_arp_slave) {
>+ bond_set_slave_inactive_flags(
>+ bond->current_arp_slave);
>+ bond->current_arp_slave = NULL;
>+ }
>
> pr_info("%s: link status definitely up for interface %s.\n",
> bond->dev->name, slave->dev->name);
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/