[SCSI] be2iscsi: Fix double free of MCCQ info memory.

[~andy/linux] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 2d7601dd6660e5a273cdabe75278ee1231e7fc23..bb8c72c79c6f31c9c932b2960df6a2c2f009a08e 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -69,7 +69,6 @@
 #include <net/rtnetlink.h>
 #include <net/sock.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 /* Uncomment to enable debugging */
@@ -531,7 +530,7 @@ static void tun_net_init(struct net_device *dev)
                ether_setup(dev);
                dev->priv_flags &= ~IFF_TX_SKB_SHARING;
 
-               random_ether_addr(dev->dev_addr);
+               eth_hw_addr_random(dev);
 
                dev->tx_queue_len = TUN_READQ_SIZE;  /* We prefer our own queue length */
                break;