From: Ted Lemon <source@isc.org>
Date: Mon, 9 Apr 2001 01:03:14 +0000 (+0000)
Subject: Work around Linux 2.4 Token Ring problem.
X-Git-Tag: V3-RC1~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c267626033afb199d0bbe49c34aad54fd0163c09;p=thirdparty%2Fdhcp.git

Work around Linux 2.4 Token Ring problem.
---

diff --git a/common/discover.c b/common/discover.c
index b3fd89695..6c3c8d914 100644
--- 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 b353bbf4d..0d1e7a4e5 100644
--- 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