diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-06-12 19:02:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 23:29:03 -0700 |
| commit | 5c5129b54f2f346c86cd23fea67e71b45f7f84ff (patch) | |
| tree | 2917749b65942edababa110625ccbb9f7c3d3d06 /drivers | |
| parent | 373500db927706d1f60785aff40b9884f789b01a (diff) | |
| download | linux-stable-5c5129b54f2f346c86cd23fea67e71b45f7f84ff.tar.gz linux-stable-5c5129b54f2f346c86cd23fea67e71b45f7f84ff.tar.bz2 linux-stable-5c5129b54f2f346c86cd23fea67e71b45f7f84ff.zip | |
bonding: use is_zero_ether_addr
Remove bogus non-portable possibly unaligned way of testing
for zero addres..
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 395f3b160a75..55bf34f59bbf 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -33,6 +33,7 @@ #include <linux/ctype.h> #include <linux/inet.h> #include <linux/rtnetlink.h> +#include <linux/etherdevice.h> #include <net/net_namespace.h> #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; |