From: "Dmitry Kravkov" <dmitry@broadcom.com>
To: "Danny Kukawka" <danny.kukawka@bisect.de>
Cc: "Eilon Greenstein" <eilong@broadcom.com>,
"Danny Kukawka" <dkukawka@suse.de>,
netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/8] bnx2x: adopt bnx2x_validate_addr() to .ndo_validate_addr changes
Date: Wed, 29 Feb 2012 18:22:15 +0200 [thread overview]
Message-ID: <1330532535.25281.2.camel@lb-tlvb-dmitry> (raw)
In-Reply-To: <1330530176-24952-3-git-send-email-danny.kukawka@bisect.de>
On Wed, 2012-02-29 at 16:42 +0100, Danny Kukawka wrote:
> Adopted bnx2x_validate_addr() to changes in .ndo_validate_addr,
> handle second parameter to be validated.
>
> Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
> ---
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
> index b4afef6..d25ef1e 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
> @@ -10532,12 +10532,19 @@ static void poll_bnx2x(struct net_device *dev)
> }
> #endif
>
> -static int bnx2x_validate_addr(struct net_device *dev)
> +static int bnx2x_validate_addr(struct net_device *dev, void *addr)
> {
> struct bnx2x *bp = netdev_priv(dev);
> + struct sockaddr *saddr;
>
> - if (!bnx2x_is_valid_ether_addr(bp, dev->dev_addr))
> - return -EADDRNOTAVAIL;
> + if (addr) {
> + saddr = addr;
> + if (!bnx2x_is_valid_ether_addr(bp, saddr->sa_data))
> + return -EADDRNOTAVAIL;
> + } else {
> + if (!bnx2x_is_valid_ether_addr(bp, dev->dev_addr))
> + return -EADDRNOTAVAIL;
> + }
> return 0;
> }
>
Isn't it preferred to calculate the correct address for test and then
call bnx2x_is_valid_ether_addr() at the end?
next prev parent reply other threads:[~2012-02-29 16:22 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 [this message]
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 ` [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=1330532535.25281.2.camel@lb-tlvb-dmitry \
--to=dmitry@broadcom.com \
--cc=danny.kukawka@bisect.de \
--cc=davem@davemloft.net \
--cc=dkukawka@suse.de \
--cc=eilong@broadcom.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).