| Message ID | 1358649789-2338-3-git-send-email-akong@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
From: akong@redhat.com Date: Sun, 20 Jan 2013 10:43:08 +0800 > From: Stefan Hajnoczi <stefanha@gmail.com> > > When we set mac address, software mac address in system and hardware mac > address all need to be updated. Current eth_mac_addr() doesn't allow > callers to implement error handling nicely. > > This patch split eth_mac_addr() to prepare part and real commit part, > then we can prepare first, and try to change hardware address, then do > the real commit if hardware address is set successfully. > > Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com> > Signed-off-by: Amos Kong <akong@redhat.com> This patch doesn't apply to net-next. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Jan 20, 2013 at 10:43:08AM +0800, akong@redhat.com wrote: > From: Stefan Hajnoczi <stefanha@gmail.com> > > When we set mac address, software mac address in system and hardware mac > address all need to be updated. Current eth_mac_addr() doesn't allow > callers to implement error handling nicely. > > This patch split eth_mac_addr() to prepare part and real commit part, > then we can prepare first, and try to change hardware address, then do > the real commit if hardware address is set successfully. > > Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com> > Signed-off-by: Amos Kong <akong@redhat.com> > --- > include/linux/etherdevice.h | 2 ++ > net/ethernet/eth.c | 43 ++++++++++++++++++++++++++++++++++++------- > 2 files changed, 38 insertions(+), 7 deletions(-) Feel free to make yourself author and put me just as Suggested-by:. I posted pseudo-code but didn't write the patch or test it, so it's fair to say that credit goes to you. :) Stefan -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 243eea1..5cc6e0e 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -40,6 +40,8 @@ extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, extern void eth_header_cache_update(struct hh_cache *hh, const struct net_device *dev, const unsigned char *haddr); +extern int eth_prepare_mac_addr_change(struct net_device *dev, void *p); +extern void eth_commit_mac_addr_change(struct net_device *dev, void *p); extern int eth_mac_addr(struct net_device *dev, void *p); extern int eth_change_mtu(struct net_device *dev, int new_mtu); extern int eth_validate_addr(struct net_device *dev); diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 4efad53..cce73eb 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -272,16 +272,11 @@ void eth_header_cache_update(struct hh_cache *hh, EXPORT_SYMBOL(eth_header_cache_update); /** - * eth_mac_addr - set new Ethernet hardware address + * eth_prepare_mac_addr_change - prepare for mac change * @dev: network device * @p: socket address - * - * Change hardware address of device. - * - * This doesn't change hardware matching, so needs to be overridden - * for most real devices. */ -int eth_mac_addr(struct net_device *dev, void *p) +int eth_prepare_mac_addr_change(struct net_device *dev, void *p) { struct sockaddr *addr = p; @@ -289,9 +284,43 @@ int eth_mac_addr(struct net_device *dev, void *p) return -EBUSY; if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; + return 0; +} +EXPORT_SYMBOL(eth_prepare_mac_addr_change); + +/** + * eth_commit_mac_addr_change - commit mac change + * @dev: network device + * @p: socket address + */ +void eth_commit_mac_addr_change(struct net_device *dev, void *p) +{ + struct sockaddr *addr = p; + memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); /* if device marked as NET_ADDR_RANDOM, reset it */ dev->addr_assign_type &= ~NET_ADDR_RANDOM; +} +EXPORT_SYMBOL(eth_commit_mac_addr_change); + +/** + * eth_mac_addr - set new Ethernet hardware address + * @dev: network device + * @p: socket address + * + * Change hardware address of device. + * + * This doesn't change hardware matching, so needs to be overridden + * for most real devices. + */ +int eth_mac_addr(struct net_device *dev, void *p) +{ + int ret; + + ret = eth_prepare_mac_addr_change(dev, p); + if (ret < 0) + return ret; + eth_commit_mac_addr_change(dev, p); return 0; } EXPORT_SYMBOL(eth_mac_addr);