Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 504f9b5a authored by Danny Kukawka's avatar Danny Kukawka Committed by David S. Miller
Browse files

ethernet: unify return value of .ndo_set_mac_address if address is invalid 



Unify return value of .ndo_set_mac_address if the given address
isn't valid. Return -EADDRNOTAVAIL as eth_mac_addr() already does
if is_valid_ether_addr() fails.

Signed-off-by: default avatarDanny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32d219ed

drivers/net/ethernet/aeroflex/greth.c

+1 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p) 
	regs = (struct greth_regs *) greth->regs;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]);

drivers/net/ethernet/broadcom/bnx2.c

+1 −1
Original line number Diff line number Diff line
@@ -7773,7 +7773,7 @@ bnx2_change_mac_addr(struct net_device *dev, void *p) 
	struct bnx2 *bp = netdev_priv(dev);



	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	if (netif_running(dev))

drivers/net/ethernet/broadcom/tg3.c

+1 −1
Original line number Diff line number Diff line
@@ -8045,7 +8045,7 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p) 
	int err = 0, skip_mac_1 = 0;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2499,7 +2499,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) 
	struct sockaddr *addr = p;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;

		return -EADDRNOTAVAIL;



	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

	t3_mac_set_address(&pi->mac, LAN_MAC_IDX, dev->dev_addr);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2809,7 +2809,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) 
	struct port_info *pi = netdev_priv(dev);



	if (!is_valid_ether_addr(addr->sa_data))

		return -EINVAL;

		return -EADDRNOTAVAIL;



	ret = t4_change_mac(pi->adapter, pi->adapter->fn, pi->viid,

			    pi->xact_addr_filt, addr->sa_data, true, true);