Work around Linux 2.4 Token Ring problem.

diff --git a/common/discover.c b/common/discover.c
index b3fd89695316b7be7722c664ab57b17b9303f116..6c3c8d9145a2d7dba123076f2fd21784ece01dca 100644 (file)
--- a/common/discover.c
+++ b/common/discover.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: discover.c,v 1.40 2001/04/05 20:50:19 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: discover.c,v 1.41 2001/04/09 01:03:12 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -461,6 +461,9 @@ void discover_interfaces (state)
 
 #ifndef HAVE_ARPHRD_IEEE802
 # define ARPHRD_IEEE802 HTYPE_IEEE802
+#endif
+#if defined (HAVE_ARPHRD_IEEE802_TR)
+                     case ARPHRD_IEEE802_TR:
 #endif
                      case ARPHRD_IEEE802:
                        tmp -> hw_address.hlen = 7;

diff --git a/includes/cf/linux.h b/includes/cf/linux.h
index b353bbf4d069a9a07e09f2a2712bac6e90da2ad2..0d1e7a4e563e014c7dec03482fd5ac242a69cc67 100644 (file)
--- a/includes/cf/linux.h
+++ b/includes/cf/linux.h
@@ -132,6 +132,9 @@ extern int h_errno;
 # endif
 # define HAVE_ARPHRD_METRICOM
 # define HAVE_ARPHRD_IEEE802
+# if (LINUX_MINOR >= 4)
+#  define HAVE_ARPHRD_IEEE802_TR
+# endif
 # define HAVE_ARPHRD_LOOPBACK
 # define HAVE_SO_BINDTODEVICE
 # define HAVE_SIOCGIFHWADDR