Commit c048aaf4 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

8139cp: allow to set mac address on running device 



So far there was not a chance to set a mac address on running 8139cp device.
This is for example needed when you want to use this NIC as a bonding slave in
bonding device in mode balance-alb. This simple patch allows it.

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6fc791ee

drivers/net/8139cp.c

+23 −1
Original line number Diff line number Diff line
@@ -1602,6 +1602,28 @@ static int cp_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
	return rc;

}



static int cp_set_mac_address(struct net_device *dev, void *p)

{

	struct cp_private *cp = netdev_priv(dev);

	struct sockaddr *addr = p;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



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



	spin_lock_irq(&cp->lock);



	cpw8_f(Cfg9346, Cfg9346_Unlock);

	cpw32_f(MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));

	cpw32_f(MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));

	cpw8_f(Cfg9346, Cfg9346_Lock);



	spin_unlock_irq(&cp->lock);



	return 0;

}



/* Serial EEPROM section. */



/*  EEPROM_Ctrl bits. */
@@ -1821,7 +1843,7 @@ static const struct net_device_ops cp_netdev_ops = { 
	.ndo_open		= cp_open,

	.ndo_stop		= cp_close,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_set_mac_address 	= cp_set_mac_address,

	.ndo_set_multicast_list	= cp_set_rx_mode,

	.ndo_get_stats		= cp_get_stats,

	.ndo_do_ioctl		= cp_ioctl,