Messages in this thread Patch in this message | | | Date | Wed, 1 Dec 2010 10:25:19 -0800 | Subject | Re: [PATCH] bonding: check for assigned mac before adopting the slaves mac address | From | David Strand <> |
| |
On Thu, Nov 25, 2010 at 7:26 PM, Jay Vosburgh <fubar@us.ibm.com> wrote: > > Ok, fair enough. If we want to get back to the original > behavior, however, your patch should only test for zero MAC address > instead of testing for zero MAC address in addition to first slave. > > -J > > --- > -Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com >
Understood, that makes sense. The updated patch is below.
--- diff -uprN a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c --- a/drivers/net/bonding/bond_main.c 2010-11-24 11:36:58.125640000 -0800 +++ b/drivers/net/bonding/bond_main.c 2010-12-01 10:12:33.728640001 -0800 @@ -1576,7 +1576,7 @@ int bond_enslave(struct net_device *bond
/* If this is the first slave, then we need to set the master's hardware * address to be the same as the slave's. */ - if (bond->slave_cnt == 0) + if (is_zero_ether_addr(bond->dev->dev_addr)) memcpy(bond->dev->dev_addr, slave_dev->dev_addr, slave_dev->addr_len); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |