Use LINUX_MAJOR and LINUX_MINOR macros instead of LINUX_* macros.

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index 4386a7e2ff848af2da25d0454788d2ab106ee609..11bf1e617a44f362109d13e8b039e489736ac6ec 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -63,7 +63,7 @@ extern int h_errno;
 #include <net/if.h>
 #include <net/route.h>
 
-#if defined (LINUX_1_X)
+#if LINUX_MAJOR == 1
 # include <linux/if_arp.h>
 # include <linux/time.h>               /* also necessary */
 #else
@@ -103,8 +103,14 @@ extern int h_errno;
 #define GET_TIME(x)    time ((x))
 
 #if defined (USE_DEFAULT_NETWORK)
+# if (LINUX_MAJOR >= 2) && (LINUX_MINOR >= 1)
+#  define USE_LPF
+#  define LINUX_SLASHPROC_DISCOVERY
+#  define PROCDEV_DEVICE "/proc/net/dev"
+# else
 #  define USE_SOCKETS
 #  define IGNORE_HOSTUNREACH
+# endif
 #endif
 
 #define ALIAS_NAMES_PERMUTED