[PATCH 2/8] bnx2x: adopt bnx2x_validate_addr() to .ndo_validate_addr changes
From: Danny Kukawka <hidden>
Date: 2012-02-29 15:45:41
Also in:
lkml
Subsystem:
broadcom bnx2x 10 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Sudarsana Kalluru, Manish Chopra, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Adopted bnx2x_validate_addr() to changes in .ndo_validate_addr, handle second parameter to be validated. Signed-off-by: Danny Kukawka <redacted> --- 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