Eliminate redundant #defines.

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index 14fdd7c585d7f19f83ed26d5b5ecb9600d7330d0..df81df58614a9798c841f94f0fa3dd794a2752e2 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -112,28 +112,26 @@ 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"
-#  define HAVE_ARPHRD_TUNNEL
+# if (LINUX_MAJOR >= 2)
+#  if (LINUX_MINOR >= 1)
+#   define USE_LPF
+#   define LINUX_SLASHPROC_DISCOVERY
+#   define PROCDEV_DEVICE "/proc/net/dev"
+#   define HAVE_ARPHRD_TUNNEL
+#  endif
 #  define HAVE_ARPHRD_METRICOM
 #  define HAVE_ARPHRD_IEEE802
 #  define HAVE_ARPHRD_LOOPBACK
 #  define HAVE_SO_BINDTODEVICE
 #  define HAVE_SIOCGIFHWADDR
-# else
-#  if (LINUX_MAJOR == 2)
-#   define HAVE_ARPHRD_METRICOM
-#   define HAVE_ARPHRD_IEEE802
-#   define HAVE_ARPHRD_LOOPBACK
-#   define HAVE_SO_BINDTODEVICE
-#   define HAVE_SIOCGIFHWADDR
-#  endif
-#  define USE_SOCKETS
-#  define IGNORE_HOSTUNREACH
+# else /* LINUX_MAJOR < 2 */
 # endif
 #endif
 
+#if !defined (USE_LPF)
+# define USE_SOCKETS
+# define IGNORE_HOSTUNREACH
+#endif
+
 #define ALIAS_NAMES_PERMUTED
 #define SKIP_DUMMY_INTERFACES