From: Danny Kukawka <danny.kukawka@bisect.de>
To: Jon Mason <jdmason@kudzu.us>
Cc: Danny Kukawka <dkukawka@suse.de>,
netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/8] neterion/s2io: fix s2io_set_mac_addr() to prevent double checks
Date: Wed, 29 Feb 2012 16:42:55 +0100 [thread overview]
Message-ID: <1330530176-24952-8-git-send-email-danny.kukawka@bisect.de> (raw)
In-Reply-To: <1330530176-24952-1-git-send-email-danny.kukawka@bisect.de>
Fix s2io_set_mac_addr() to prevent double validation checks from
dev_set_mac_address().
Don't use s2io_set_mac_addr() in s2io_io_resume() since it makes
no sense to copy netdev->dev_addr to itself. Use do_s2io_prog_unicast()
instead since this is what's needed and checked here.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
drivers/net/ethernet/neterion/s2io.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 22a8de0..cf7b3eb 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -5247,9 +5247,6 @@ static int s2io_set_mac_addr(struct net_device *dev, void *p)
{
struct sockaddr *addr = p;
- if (!is_valid_ether_addr(addr->sa_data))
- return -EADDRNOTAVAIL;
-
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
/* store the MAC address in CAM */
@@ -8658,7 +8655,7 @@ static void s2io_io_resume(struct pci_dev *pdev)
return;
}
- if (s2io_set_mac_addr(netdev, netdev->dev_addr) == FAILURE) {
+ if (do_s2io_prog_unicast(netdev, netdev->dev_addr) == FAILURE) {
s2io_card_down(sp);
pr_err("Can't restore mac addr after reset.\n");
return;
--
1.7.8.3
next prev parent reply other threads:[~2012-02-29 15:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 16:08 [PATCH 0/8] validate MAC address before call .ndo_set_mac_address Danny Kukawka
2012-02-29 15:42 ` [PATCH 1/8] net: validate MAC address directly in dev_set_mac_address() Danny Kukawka
2012-02-29 15:42 ` [PATCH 2/8] bnx2x: adopt bnx2x_validate_addr() to .ndo_validate_addr changes Danny Kukawka
2012-02-29 16:22 ` Dmitry Kravkov
2012-02-29 17:08 ` Danny Kukawka
2012-02-29 17:16 ` Dmitry Kravkov
2012-02-29 17:20 ` Dmitry Kravkov
2012-02-29 15:42 ` [PATCH 3/8] cris/eth_v10: use dev_set_mac_address() instead of e100_set_mac_address() Danny Kukawka
2012-03-01 9:33 ` Jesper Nilsson
2012-02-29 15:42 ` [PATCH 4/8] bcm63xx_enet: use dev_set_mac_address() instead of bcm_enet_set_mac_address() Danny Kukawka
2012-02-29 15:49 ` Florian Fainelli
2012-02-29 15:42 ` [PATCH 5/8] ethoc: add .ndo_validate_addr to net_device_ops Danny Kukawka
2012-02-29 15:42 ` [PATCH 6/8] lantiq_etop: use dev_set_mac_address() instead of ltq_etop_set_mac_address() Danny Kukawka
2012-02-29 15:42 ` Danny Kukawka [this message]
2012-02-29 15:42 ` [PATCH 8/8] octeon: use dev_set_mac_address() instead of octeon_mgmt_set_mac_address() Danny Kukawka
2012-02-29 15:58 ` [PATCH 0/8] validate MAC address before call .ndo_set_mac_address Ben Hutchings
2012-02-29 16:14 ` Danny Kukawka
2012-02-29 16:24 ` Danny Kukawka
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=1330530176-24952-8-git-send-email-danny.kukawka@bisect.de \
--to=danny.kukawka@bisect.de \
--cc=davem@davemloft.net \
--cc=dkukawka@suse.de \
--cc=jdmason@kudzu.us \
--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).