[PATCH] uml: clean our set_ether_mac

Clean set_ether_mac usage. Maybe could also be removed, but surely it can't
be a global function taking a void* argument.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Paolo 'Blaisorblade' Giarrusso and committed by
Linus Torvalds
bf61f50d 602cc241

+6 -9
+6 -8
arch/um/drivers/net_kern.c
··· 31 31 #include "irq_user.h" 32 32 #include "irq_kern.h" 33 33 34 + static inline void set_ether_mac(struct net_device *dev, unsigned char *addr) 35 + { 36 + memcpy(dev->dev_addr, addr, ETH_ALEN); 37 + } 38 + 34 39 #define DRIVER_NAME "uml-netdev" 35 40 36 41 static DEFINE_SPINLOCK(opened_lock); ··· 247 242 struct sockaddr *hwaddr = addr; 248 243 249 244 spin_lock(&lp->lock); 250 - memcpy(dev->dev_addr, hwaddr->sa_data, ETH_ALEN); 245 + set_ether_mac(dev, hwaddr->sa_data); 251 246 spin_unlock(&lp->lock); 252 247 253 248 return(0); ··· 793 788 return; 794 789 } 795 790 memcpy(bin_buf, &in->ifa_address, sizeof(in->ifa_address)); 796 - } 797 - 798 - void set_ether_mac(void *d, unsigned char *addr) 799 - { 800 - struct net_device *dev = d; 801 - 802 - memcpy(dev->dev_addr, addr, ETH_ALEN); 803 791 } 804 792 805 793 struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra)
-1
arch/um/include/net_user.h
··· 26 26 27 27 extern void ether_user_init(void *data, void *dev); 28 28 extern void dev_ip_addr(void *d, unsigned char *bin_buf); 29 - extern void set_ether_mac(void *d, unsigned char *addr); 30 29 extern void iter_addresses(void *d, void (*cb)(unsigned char *, 31 30 unsigned char *, void *), 32 31 void *arg);