提交 5c5129b5 编写于 作者: S Stephen Hemminger 提交者: David S. Miller

bonding: use is_zero_ether_addr

Remove bogus non-portable possibly unaligned way of testing
for zero addres..
Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 373500db
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/etherdevice.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include "bonding.h" #include "bonding.h"
...@@ -275,10 +276,9 @@ static ssize_t bonding_store_slaves(struct device *d, ...@@ -275,10 +276,9 @@ static ssize_t bonding_store_slaves(struct device *d,
/* If this is the first slave, then we need to set /* If this is the first slave, then we need to set
the master's hardware address to be the same as the the master's hardware address to be the same as the
slave's. */ 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, memcpy(bond->dev->dev_addr, dev->dev_addr,
dev->addr_len); dev->addr_len);
}
/* Set the slave's MTU to match the bond */ /* Set the slave's MTU to match the bond */
original_mtu = dev->mtu; original_mtu = dev->mtu;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册