Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf61f50d authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 602cc241

arch/um/drivers/net_kern.c

+6 −8
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
#include "irq_user.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"



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;



	spin_lock(&lp->lock);

	memcpy(dev->dev_addr, hwaddr->sa_data, ETH_ALEN);

	set_ether_mac(dev, hwaddr->sa_data);

	spin_unlock(&lp->lock);



	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));

}



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)

{

	if((skb != NULL) && (skb_tailroom(skb) < extra)){

arch/um/include/net_user.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ struct net_user_info { 


extern void ether_user_init(void *data, void *dev);

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 *, 

					       unsigned char *, void *), 

			   void *arg);