net/ucc_geth: allow to set mac address on running device
Subsystems (2)
PATCH 1/1 net/ucc_geth: allow to set mac address on running device
Inspired by the patch for 8139too (bda6a15a).
Currently we can't set mac address on a running ucc_geth device. But this is needed when you use this device as a bonding slave in bonding device in balance-alb mode. So add this feature for ucc_geth device.
--- drivers/net/ucc_geth.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-)
drivers/net/ucc_geth.c +32 -1
@@ -3339,6 +3339,37 @@ static void ucc_netpoll(struct net_device *dev) }#endif /* CONFIG_NET_POLL_CONTROLLER */ +static int ucc_geth_set_mac_addr (struct net_device *dev,void *p) +{ +struct ucc_geth_private *ugeth =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); + +/* +* If device is not running, we will set mac addr register +* when opening the device. +*/ +if (!netif_running (dev)) +return 0 ; + +spin_lock_irq (&ugeth->lock); +init_mac_station_addr_regs (dev->dev_addr[0 ], + dev->dev_addr[1 ], + dev->dev_addr[2 ], + dev->dev_addr[3 ], + dev->dev_addr[4 ], + dev->dev_addr[5 ], + &ugeth->ug_regs->macstnaddr1, + &ugeth->ug_regs->macstnaddr2); +spin_unlock_irq (&ugeth->lock); + +return 0 ; +} +/* Called when something needs to use the ethernet device */ /* Returns 0 for success. */ static int ucc_geth_open (struct net_device *dev)
@@ -3515,7 +3546,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = { .ndo_stop = ucc_geth_close, .ndo_start_xmit = ucc_geth_start_xmit, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = ucc_geth_set_mac_addr, .ndo_change_mtu = eth_change_mtu, .ndo_set_multicast_list = ucc_geth_set_multi, .ndo_tx_timeout = ucc_geth_timeout,
Signature · 1 line
1.6.0.4.771.gef3b3
From: Kevin Hao <[email protected]>
Date: Wed, 27 May 2009 09:48:56 +0800
Quoted 8 lines
Inspired by the patch for 8139too (
bda6a15a).Currently we can't set mac address on a running
ucc_gethdevice. But this is needed when you use this device as a bonding slave in bonding device in balance-alb mode. So add this feature forucc_gethdevice.Signed-off-by Kevin Hao <[email protected]>
Applied to net-next-2.6, thanks.
From: Kevin Hao <[email protected]>
Date: Wed, 27 May 2009 09:48:56 +0800
Quoted 8 lines
Inspired by the patch for 8139too (
bda6a15a).Currently we can't set mac address on a running
ucc_gethdevice. But this is needed when you use this device as a bonding slave in bonding device in balance-alb mode. So add this feature forucc_gethdevice.Signed-off-by Kevin Hao <[email protected]>
I applied this patch already, there is no need to post it again.