[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1330530176-24952-3-git-send-email-danny.kukawka@bisect.de>
Date: Wed, 29 Feb 2012 16:42:50 +0100
From: Danny Kukawka <danny.kukawka@...ect.de>
To: Eilon Greenstein <eilong@...adcom.com>
Cc: Danny Kukawka <dkukawka@...e.de>, netdev@...r.kernel.org,
"David S. Miller" <davem@...emloft.net>,
linux-kernel@...r.kernel.org
Subject: [PATCH 2/8] bnx2x: adopt bnx2x_validate_addr() to .ndo_validate_addr changes
Adopted bnx2x_validate_addr() to changes in .ndo_validate_addr,
handle second parameter to be validated.
Signed-off-by: Danny Kukawka <danny.kukawka@...ect.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;
}
--
1.7.8.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists