From a3b9dbed2c8d273e35916d07b59b045cc29a7529 Mon Sep 17 00:00:00 2001 From: David Strand Date: Wed, 1 Dec 2010 11:43:08 -0800 Subject: [PATCH] --- yaml --- r: 223181 b: refs/heads/master c: d13a2cb63d06fe2e3067c7d40f9a5946abd614c8 h: refs/heads/master i: 223179: 77c2f2ee3917d1e615628586f945291631d842b3 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5812cfb7b90a..a52f604749d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c08af030212d1a34593397bb01f262ff31c3629 +refs/heads/master: d13a2cb63d06fe2e3067c7d40f9a5946abd614c8 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 71a169740d05..2fee00a4c9ef 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -1576,7 +1576,7 @@ 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) + if (is_zero_ether_addr(bond->dev->dev_addr)) memcpy(bond->dev->dev_addr, slave_dev->dev_addr, slave_dev->addr_len);