Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] uml: clean our set_ether_mac

Browse Source 
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>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso 2006-09-25 23:33:07 -07:00 committed by Linus Torvalds
parent 602cc24181
commit bf61f50d63
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/um/drivers/net_kern.c
View File

@ -31,6 +31,11 @@
#include "irq_user.h" #include "irq_user.h"
#include "irq_kern.h" #include "irq_kern.h"
static inline void set_ether_mac(struct net_device *dev, unsigned char *addr)
{
memcpy(dev->dev_addr, addr, ETH_ALEN);
}
#define DRIVER_NAME "uml-netdev" #define DRIVER_NAME "uml-netdev"
static DEFINE_SPINLOCK(opened_lock); static DEFINE_SPINLOCK(opened_lock);
@ -242,7 +247,7 @@ static int uml_net_set_mac(struct net_device *dev, void *addr)
struct sockaddr *hwaddr = addr; struct sockaddr *hwaddr = addr;
spin_lock(&lp->lock); spin_lock(&lp->lock);
memcpy(dev->dev_addr, hwaddr->sa_data, ETH_ALEN); set_ether_mac(dev, hwaddr->sa_data);
spin_unlock(&lp->lock); spin_unlock(&lp->lock);
return(0); return(0);
@ -790,13 +795,6 @@ void dev_ip_addr(void *d, unsigned char *bin_buf)
memcpy(bin_buf, &in->ifa_address, sizeof(in->ifa_address)); memcpy(bin_buf, &in->ifa_address, sizeof(in->ifa_address));
} }
void set_ether_mac(void *d, unsigned char *addr)
{
struct net_device *dev = d;
memcpy(dev->dev_addr, addr, ETH_ALEN);
}
struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra) struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra)
{ {
if((skb != NULL) && (skb_tailroom(skb) < extra)){ if((skb != NULL) && (skb_tailroom(skb) < extra)){

1
arch/um/include/net_user.h
View File

@ -26,7 +26,6 @@ struct net_user_info {
extern void ether_user_init(void *data, void *dev); extern void ether_user_init(void *data, void *dev);
extern void dev_ip_addr(void *d, unsigned char *bin_buf); extern void dev_ip_addr(void *d, unsigned char *bin_buf);
extern void set_ether_mac(void *d, unsigned char *addr);
extern void iter_addresses(void *d, void (*cb)(unsigned char *, extern void iter_addresses(void *d, void (*cb)(unsigned char *,
unsigned char *, void *), unsigned char *, void *),
void *arg); void *arg);