aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_sysfs.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-05-18 21:14:29 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-02 07:16:23 -0400
commitc20811a79e671a6a1fe86a8c1afe04aca8a7f085 (patch)
tree21c68c6a711de84781dff4a561566dc0e325959b /drivers/net/bonding/bond_sysfs.c
parente95095540c5276fc9922cb14376afc36f846af1f (diff)
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>
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
-rw-r--r--drivers/net/bonding/bond_sysfs.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index a4cbaf78ad1c..496ac1ec614d 100644
--- 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,
250 switch (command[0]) { 250 switch (command[0]) {
251 case '+': 251 case '+':
252 pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name); 252 pr_info("%s: Adding slave %s.\n", bond->dev->name, dev->name);
253
254 /* If this is the first slave, then we need to set
255 the master's hardware address to be the same as the
256 slave's. */
257 if (is_zero_ether_addr(bond->dev->dev_addr))
258 memcpy(bond->dev->dev_addr, dev->dev_addr,
259 dev->addr_len);
260
261 res = bond_enslave(bond->dev, dev); 253 res = bond_enslave(bond->dev, dev);
262 break; 254 break;
263 255