Do a simple test for linux/if_tun.h instead of no test at all.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index c320e51..302fa62 100644 (file)
--- 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 <linux/if_tun.h>
-#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));