Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932785Ab2B2QWa (ORCPT ); Wed, 29 Feb 2012 11:22:30 -0500 Received: from mms2.broadcom.com ([216.31.210.18]:1306 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932662Ab2B2QW2 (ORCPT ); Wed, 29 Feb 2012 11:22:28 -0500 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Message-ID: <1330532535.25281.2.camel@lb-tlvb-dmitry> Subject: Re: [PATCH 2/8] bnx2x: adopt bnx2x_validate_addr() to .ndo_validate_addr changes From: "Dmitry Kravkov" To: "Danny Kukawka" cc: "Eilon Greenstein" , "Danny Kukawka" , netdev@vger.kernel.org, "David S. Miller" , linux-kernel@vger.kernel.org Date: Wed, 29 Feb 2012 18:22:15 +0200 In-Reply-To: <1330530176-24952-3-git-send-email-danny.kukawka@bisect.de> References: <1330530176-24952-1-git-send-email-danny.kukawka@bisect.de> <1330530176-24952-3-git-send-email-danny.kukawka@bisect.de> X-Mailer: Evolution 3.2.2- MIME-Version: 1.0 X-WSS-ID: 63508D792A8625754-01-01 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1617 Lines: 46 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 > --- > 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? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/