Message ID | 1422253021-3798-3-git-send-email-jtoppins@cumulusnetworks.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Jonathan Toppins <jtoppins@cumulusnetworks.com> wrote: >From: Wilson Kok <wkok@cumulusnetworks.com> > >Mode 802.3ad, fix incorrect bond slave active state when slave is not in >active aggregator. During bond_open(), the bonding driver always sets >the slave active flag to true if the bond is not in active-backup, alb, >or tlb modes. Bonding should let the aggregator selection logic set the >active flag when in 802.3ad mode. > >Cc: Andy Gospodarek <gospo@cumulusnetworks.com> >Reviewed-by: Nikolay Aleksandrov <nikolay@redhat.com> >Signed-off-by: Wilson Kok <wkok@cumulusnetworks.com> >Signed-off-by: Jonathan Toppins <jtoppins@cumulusnetworks.com> Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com> >--- > drivers/net/bonding/bond_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c >index 02ffedb..c475d90 100644 >--- a/drivers/net/bonding/bond_main.c >+++ b/drivers/net/bonding/bond_main.c >@@ -3066,7 +3066,7 @@ static int bond_open(struct net_device *bond_dev) > slave != rcu_access_pointer(bond->curr_active_slave)) { > bond_set_slave_inactive_flags(slave, > BOND_SLAVE_NOTIFY_NOW); >- } else { >+ } else if (BOND_MODE(bond) != BOND_MODE_8023AD) { > bond_set_slave_active_flags(slave, > BOND_SLAVE_NOTIFY_NOW); > } >-- >1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 02ffedb..c475d90 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3066,7 +3066,7 @@ static int bond_open(struct net_device *bond_dev) slave != rcu_access_pointer(bond->curr_active_slave)) { bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW); - } else { + } else if (BOND_MODE(bond) != BOND_MODE_8023AD) { bond_set_slave_active_flags(slave, BOND_SLAVE_NOTIFY_NOW); }