diff options
| author | Maksim Krasnyanskiy <maxk@qualcomm.com> | 2004-12-23 01:41:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-23 01:41:18 -0800 |
| commit | 49f81c2dde784663ceec0d7c50fbc12828030349 (patch) | |
| tree | 0dbc6d0d243ea4294930c363f75a21b4ca86b4c0 | |
| parent | 5ce8b2305f6487c1e7cbc417a36466a43aa7b1d5 (diff) | |
Use random_ether_addr() to generate TAP MAC address.
Signed-off-by: Mark Smith <markzzzsmith@yahoo.com.au>
Signed-off-by: Max Krasnyansky <maxk@qualcomm.com>
| -rw-r--r-- | drivers/net/tun.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 55b6aa079f12..251ec5a57e42 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -18,6 +18,9 @@ /* * Changes: * + * Mark Smith <markzzzsmith@yahoo.com.au> + * Use random_ether_addr() for tap MAC address. + * * Harald Roelle <harald.roelle@ifi.lmu.de> 2004/04/20 * Fixes in packet dropping, queue length setting and queue wakeup. * Increased default tx queue length. @@ -42,7 +45,6 @@ #include <linux/poll.h> #include <linux/fcntl.h> #include <linux/init.h> -#include <linux/random.h> #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> @@ -158,11 +160,8 @@ static void tun_net_init(struct net_device *dev) /* Ethernet TAP Device */ dev->set_multicast_list = tun_net_mclist; - /* Generate random Ethernet address. */ - *(u16 *)dev->dev_addr = htons(0x00FF); - get_random_bytes(dev->dev_addr + sizeof(u16), 4); - ether_setup(dev); + random_ether_addr(dev->dev_addr); dev->tx_queue_len = TUN_READQ_SIZE; /* We prefer our own queue length */ break; } |