bonding: move dev_addr cpy to bond_enslave

Move the code that copies slave's mac address in case that's the first slave into
bond_enslave. Ifenslave app does this also but that's not a problem. This is
something that should be done in bond_enslave, and it shound not matter from
where is it called.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2c3f9db91b50517b3cb9fe0d7cdd0722267080a3..4e7473e557ff2fc35e859824dfe30a4ec4e56b52 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1522,6 +1522,13 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                }
        }
 
+       /* 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)
+               memcpy(bond->dev->dev_addr, slave_dev->dev_addr,
+                      slave_dev->addr_len);
+
+
        new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
        if (!new_slave) {
                res = -ENOMEM;

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index a4cbaf78ad1c41be4a641ccfdc38108d2afe2f38..496ac1ec614dd2fada95f1ab95f96e169482febd 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -250,14 +250,6 @@ static ssize_t bonding_store_slaves(struct device *d,
        switch (command[0]) {
        case '+':
                pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name);
-
-               /* 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 (is_zero_ether_addr(bond->dev->dev_addr))
-                       memcpy(bond->dev->dev_addr, dev->dev_addr,
-                              dev->addr_len);
-
                res = bond_enslave(bond->dev, dev);
                break;