From: Jeffrey Huang Date: Wed, 2 Dec 2015 06:54:06 +0000 (-0500) Subject: bnxt_en: Fixed incorrect implementation of ndo_set_mac_address X-Git-Tag: v4.1.12-92~126^2~108 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cb41225bfb5dc28daab1032587b98702987d6569;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Fixed incorrect implementation of ndo_set_mac_address Orabug: 23221795 The existing ndo_set_mac_address only copies the new MAC addr and didn't set the new MAC addr to the HW. The correct way is to delete the existing default MAC filter from HW and add the new one. Because of RFS filters are also dependent on the default mac filter l2 context, the driver must go thru close_nic() to delete the default MAC and RFS filters, then open_nic() to set the default MAC address to HW. Signed-off-by: Jeffrey Huang Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 1fc2cfd03bbf8f1f8b6b90f0858faba8bd6631c4) Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index abe2039efe8da..421350ec6d125 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -5229,13 +5229,22 @@ init_err: static int bnxt_change_mac_addr(struct net_device *dev, void *p) { struct sockaddr *addr = p; + struct bnxt *bp = netdev_priv(dev); + int rc = 0; if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; + if (ether_addr_equal(addr->sa_data, dev->dev_addr)) + return 0; + memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); + if (netif_running(dev)) { + bnxt_close_nic(bp, false, false); + rc = bnxt_open_nic(bp, false, false); + } - return 0; + return rc; } /* rtnl_lock held */