diff options
| author |   Jeffrey Huang <huangjw@broadcom.com> | 2015-12-02 01:54:06 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-03 15:07:13 -0500 |
| commit | 1fc2cfd03bbf8f1f8b6b90f0858faba8bd6631c4 (patch) | |
| tree | 1743456df131a8705c0aff86c6abbd9495032964 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | net: lpc_eth: remove irq > NR_IRQS check from probe() (diff) | |
| download | linux-dev-1fc2cfd03bbf8f1f8b6b90f0858faba8bd6631c4.tar.xz linux-dev-1fc2cfd03bbf8f1f8b6b90f0858faba8bd6631c4.zip | |
bnxt_en: Fixed incorrect implementation of ndo_set_mac_address
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 <huangjw@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index db15c5ee09c5..651b5878eba1 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -5212,13 +5212,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 */ |