From: John Crispin <john@phrozen.org>
To: "David S. Miller" <davem@davemloft.net>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
John Crispin <john@phrozen.org>
Subject: [PATCH 1/4] net-next: dsa: fix duplicate invocation of set_addr()
Date: Mon, 19 Sep 2016 15:28:00 +0200 [thread overview]
Message-ID: <1474291683-44167-2-git-send-email-john@phrozen.org> (raw)
In-Reply-To: <1474291683-44167-1-git-send-email-john@phrozen.org>
commit 83c0afaec7b730b ("net: dsa: Add new binding implementation")
has a duplicate invocation of the set_addr() operation callback. Remove one
of them.
Signed-off-by: John Crispin <john@phrozen.org>
---
net/dsa/dsa2.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 8278385..cffc19e 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -308,10 +308,6 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
if (err < 0)
return err;
- err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
- if (err < 0)
- return err;
-
if (!ds->slave_mii_bus && ds->ops->phy_read) {
ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
if (!ds->slave_mii_bus)
--
1.7.10.4
next prev parent reply other threads:[~2016-09-19 13:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 13:27 [PATCH 0/4] net-next: dsa: set_addr should be optional John Crispin
2016-09-19 13:28 ` John Crispin [this message]
2016-09-19 13:44 ` [PATCH 1/4] net-next: dsa: fix duplicate invocation of set_addr() Andrew Lunn
2016-09-19 13:28 ` [PATCH 2/4] net-next: dsa: make the set_addr() operation optional John Crispin
2016-09-19 13:28 ` [PATCH 3/4] net-next: dsa: b53: remove empty set_addr() stub John Crispin
2016-09-19 13:28 ` [PATCH 4/4] net-next: dsa: qca8k: " John Crispin
2016-09-19 13:45 ` [PATCH 0/4] net-next: dsa: set_addr should be optional Andrew Lunn
2016-09-19 19:41 ` Florian Fainelli
2016-09-20 8:48 ` 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=1474291683-44167-2-git-send-email-john@phrozen.org \
--to=john@phrozen.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).