From: Danny Kukawka <danny.kukawka@bisect.de>
To: "David S. Miller" <davem@davemloft.net>
Cc: Danny Kukawka <dkukawka@suse.de>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Alexey Dobriyan <adobriyan@gmail.com>,
Joe Perches <joe@perches.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/8] ethoc: add .ndo_validate_addr to net_device_ops
Date: Wed, 29 Feb 2012 16:42:53 +0100 [thread overview]
Message-ID: <1330530176-24952-6-git-send-email-danny.kukawka@bisect.de> (raw)
In-Reply-To: <1330530176-24952-1-git-send-email-danny.kukawka@bisect.de>
Add eth_validate_addr() to .ndo_validate_addr to get validation
checks in dev_set_mac_address() working. Remove
is_valid_ether_addr() from ethoc_set_mac_address() to prevent
double check.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
drivers/net/ethernet/ethoc.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index a381678..ca80f19 100644
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -776,9 +776,6 @@ static int ethoc_set_mac_address(struct net_device *dev, void *addr)
struct ethoc *priv = netdev_priv(dev);
u8 *mac = (u8 *)addr;
- if (!is_valid_ether_addr(mac))
- return -EADDRNOTAVAIL;
-
ethoc_write(priv, MAC_ADDR0, (mac[2] << 24) | (mac[3] << 16) |
(mac[4] << 8) | (mac[5] << 0));
ethoc_write(priv, MAC_ADDR1, (mac[0] << 8) | (mac[1] << 0));
@@ -899,6 +896,7 @@ static const struct net_device_ops ethoc_netdev_ops = {
.ndo_change_mtu = ethoc_change_mtu,
.ndo_tx_timeout = ethoc_tx_timeout,
.ndo_start_xmit = ethoc_start_xmit,
+ .ndo_validate_addr = eth_validate_addr,
};
/**
--
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 ` Danny Kukawka [this message]
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 ` [PATCH 7/8] neterion/s2io: fix s2io_set_mac_addr() to prevent double checks Danny Kukawka
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-6-git-send-email-danny.kukawka@bisect.de \
--to=danny.kukawka@bisect.de \
--cc=adobriyan@gmail.com \
--cc=davem@davemloft.net \
--cc=dkukawka@suse.de \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
/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).