diff --git a/[refs] b/[refs] index f15d5321bc86..c6e4c207c21d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 373500db927706d1f60785aff40b9884f789b01a +refs/heads/master: 5c5129b54f2f346c86cd23fea67e71b45f7f84ff diff --git a/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c index 395f3b160a75..55bf34f59bbf 100644 --- a/trunk/drivers/net/bonding/bond_sysfs.c +++ b/trunk/drivers/net/bonding/bond_sysfs.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include "bonding.h" @@ -275,10 +276,9 @@ static ssize_t bonding_store_slaves(struct device *d, /* 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 (!(*((u32 *) & (bond->dev->dev_addr[0])))) { + if (is_zero_ether_addr(bond->dev->dev_addr)) memcpy(bond->dev->dev_addr, dev->dev_addr, dev->addr_len); - } /* Set the slave's MTU to match the bond */ original_mtu = dev->mtu;