Commit 646cbcda authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

um: net: use eth_hw_addr_random() to generate random mac



Also remove unused "mac" from uml_net struct.
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15c6ff3b
...@@ -293,8 +293,9 @@ static void uml_net_user_timer_expire(unsigned long _conn) ...@@ -293,8 +293,9 @@ static void uml_net_user_timer_expire(unsigned long _conn)
#endif #endif
} }
static int setup_etheraddr(char *str, unsigned char *addr, char *name) static void setup_etheraddr(struct net_device *dev, char *str)
{ {
unsigned char *addr = dev->dev_addr;
char *end; char *end;
int i; int i;
...@@ -334,13 +335,12 @@ static int setup_etheraddr(char *str, unsigned char *addr, char *name) ...@@ -334,13 +335,12 @@ static int 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 0; return;
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", dev->name);
eth_random_addr(addr); eth_hw_addr_random(dev);
return 1;
} }
static DEFINE_SPINLOCK(devices_lock); static DEFINE_SPINLOCK(devices_lock);
...@@ -392,7 +392,6 @@ static void eth_configure(int n, void *init, char *mac, ...@@ -392,7 +392,6 @@ 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);
...@@ -419,9 +418,9 @@ static void eth_configure(int n, void *init, char *mac, ...@@ -419,9 +418,9 @@ 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);
random_mac = setup_etheraddr(mac, device->mac, dev->name); setup_etheraddr(dev, mac);
printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac); printk(KERN_INFO "Netdevice %d (%pM) : ", n, dev->dev_addr);
lp = netdev_priv(dev); lp = netdev_priv(dev);
/* This points to the transport private data. It's still clear, but we /* This points to the transport private data. It's still clear, but we
...@@ -468,17 +467,12 @@ static void eth_configure(int n, void *init, char *mac, ...@@ -468,17 +467,12 @@ static void eth_configure(int n, void *init, char *mac,
init_timer(&lp->tl); init_timer(&lp->tl);
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
lp->tl.function = uml_net_user_timer_expire; lp->tl.function = uml_net_user_timer_expire;
memcpy(lp->mac, device->mac, sizeof(lp->mac)); memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
if ((transport->user->init != NULL) && if ((transport->user->init != NULL) &&
((*transport->user->init)(&lp->user, dev) != 0)) ((*transport->user->init)(&lp->user, dev) != 0))
goto out_unregister; goto out_unregister;
/* don't use eth_mac_addr, it will not work here */
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;
......
...@@ -18,7 +18,6 @@ struct uml_net { ...@@ -18,7 +18,6 @@ struct uml_net {
struct net_device *dev; struct net_device *dev;
struct platform_device pdev; struct platform_device pdev;
int index; int index;
unsigned char mac[ETH_ALEN];
}; };
struct uml_net_private { struct uml_net_private {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment