X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Flinux%2Fdevice.c;h=302fa6288d946c66008987cdcc8d18b2f40b44b8;hb=ab6f76f6a9fc8028fff96322a52b770710ffa1a9;hp=c320e510877d370ef2c9b4074a7c7962fa6d0f08;hpb=de78d79db84c486afcc353884ec1770866beb653;p=tinc diff --git a/src/linux/device.c b/src/linux/device.c index c320e510..302fa628 100644 --- a/src/linux/device.c +++ b/src/linux/device.c @@ -22,12 +22,8 @@ #include "system.h" -#ifdef HAVE_TUNTAP -#ifdef LINUX_IF_TUN_H -#include LINUX_IF_TUN_H -#else +#ifdef HAVE_LINUX_IF_TUN_H #include -#endif #define DEFAULT_DEVICE "/dev/net/tun" #else #define DEFAULT_DEVICE "/dev/tap0" @@ -65,7 +61,7 @@ bool setup_device(void) device = DEFAULT_DEVICE; if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) -#ifdef HAVE_TUNTAP +#ifdef HAVE_LINUX_IF_TUN_H iface = netname; #else iface = rindex(device, '/') ? rindex(device, '/') + 1 : device; @@ -77,7 +73,7 @@ bool setup_device(void) return false; } -#ifdef HAVE_TUNTAP +#ifdef HAVE_LINUX_IF_TUN_H /* Ok now check if this is an old ethertap or a new tun/tap thingie */ memset(&ifr, 0, sizeof(ifr));