From: Jay Vosburgh <fubar@us.ibm.com>
To: David Strand <dpstrand@gmail.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH] bonding: check for assigned mac before adopting the slaves mac address
Date: Wed, 01 Dec 2010 11:21:08 -0800 [thread overview]
Message-ID: <27001.1291231268@death> (raw)
In-Reply-To: <AANLkTinXD6p25BoN0+JuvFM9v6K-oibOAFJebP08F29N@mail.gmail.com>
From: David Strand <dpstrand@gmail.com>
Restore the check for an unassigned mac address before adopting the
first slaves as it's own. The change in behavior was introduced by:
commit c20811a79e671a6a1fe86a8c1afe04aca8a7f085
Author: Jiri Pirko <jpirko@redhat.com>
bonding: move dev_addr cpy to bond_enslave
Signed-off-by: David Strand <dpstrand@gmail.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
---
diff -uprN a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c 2010-11-24 11:36:58.125640000 -0800
+++ b/drivers/net/bonding/bond_main.c 2010-12-01 10:12:33.728640001 -0800
@@ -1576,7 +1576,7 @@ int bond_enslave(struct net_device *bond
/* 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);
next prev parent reply other threads:[~2010-12-01 19:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 19:15 [PATCH] bonding: check for assigned mac before adopting the slaves mac address David Strand
2010-12-01 19:21 ` Jay Vosburgh [this message]
2010-12-01 19:43 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2010-11-24 23:12 David Strand
2010-11-24 23:33 ` Jay Vosburgh
2010-11-25 0:44 ` Laurent Chavey
2010-11-25 1:45 ` David Strand
2010-11-26 3:26 ` Jay Vosburgh
2010-12-01 18:25 ` David Strand
2010-12-01 18:45 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27001.1291231268@death \
--to=fubar@us.ibm.com \
--cc=davem@davemloft.net \
--cc=dpstrand@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.