X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=8d042d21f3e77fcd4cdcb639057cfe86c32f6bef;hp=b4360a6a88e39220417eec816948a8cbbdc3d9a7;hb=16974ec1726d93508bdfa7a6046d4795510f981a;hpb=e913f3f232e4809b7218d081ab9f94cef1c94ac3

diff --git a/src/linux/device.c b/src/linux/device.c
index b4360a6a..8d042d21 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -134,6 +134,9 @@ static bool setup_device(void) {
 		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 	}
 
+	if(overwrite_mac && !ioctl(device_fd, SIOCGIFHWADDR, &ifr))
+		memcpy(mymac.x, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+
 	logger(LOG_INFO, "%s is a %s", device, device_info);
 
 	return true;