leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UML net: set addr_assign_type if random_ether_addr() used

Browse Source 
Set addr_assign_type correctly to NET_ADDR_RANDOM in case
a random MAC address was generated and assigned to the netdevice.

Return state from setup_etheraddr() about returning a random
MAC address or not and check this state in eth_configure().

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Danny Kukawka 2012-02-17 16:05:03 -05:00 committed by David S. Miller
parent 6a214fd414
commit 95f2054f16
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,7 +293,7 @@ static void uml_net_user_timer_expire(unsigned long _conn)
#endif #endif
} }
static void setup_etheraddr(char *str, unsigned char *addr, char *name) static int setup_etheraddr(char *str, unsigned char *addr, char *name)
{ {
char *end; char *end;
int i; int i;
@ -334,12 +334,13 @@ static void setup_etheraddr(char *str, unsigned char *addr, char *name)
addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4], addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
addr[5]); addr[5]);
} }
return; return 0;
random: random:
printk(KERN_INFO printk(KERN_INFO
"Choosing a random ethernet address for device %s\n", name); "Choosing a random ethernet address for device %s\n", name);
random_ether_addr(addr); random_ether_addr(addr);
return 1;
} }
static DEFINE_SPINLOCK(devices_lock); static DEFINE_SPINLOCK(devices_lock);
@ -391,6 +392,7 @@ static void eth_configure(int n, void *init, char *mac,
struct net_device *dev; struct net_device *dev;
struct uml_net_private *lp; struct uml_net_private *lp;
int err, size; int err, size;
int random_mac;
size = transport->private_size + sizeof(struct uml_net_private); size = transport->private_size + sizeof(struct uml_net_private);
@ -417,7 +419,7 @@ static void eth_configure(int n, void *init, char *mac,
*/ */
snprintf(dev->name, sizeof(dev->name), "eth%d", n); snprintf(dev->name, sizeof(dev->name), "eth%d", n);
setup_etheraddr(mac, device->mac, dev->name); random_mac = setup_etheraddr(mac, device->mac, dev->name);
printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac); printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
@ -474,6 +476,9 @@ static void eth_configure(int n, void *init, char *mac,
/* don't use eth_mac_addr, it will not work here */ /* don't use eth_mac_addr, it will not work here */
memcpy(dev->dev_addr, device->mac, ETH_ALEN); memcpy(dev->dev_addr, device->mac, ETH_ALEN);
if (random_mac)
dev->addr_assign_type |= NET_ADDR_RANDOM;
dev->mtu = transport->user->mtu; dev->mtu = transport->user->mtu;
dev->netdev_ops = &uml_netdev_ops; dev->netdev_ops = &uml_netdev_ops;
dev->ethtool_ops = &uml_net_ethtool_ops; dev->ethtool_ops = &uml_net_ethtool_ops;