diff options
| author | Ted Lemon <source@isc.org> | 2001-04-09 01:03:14 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2001-04-09 01:03:14 +0000 |
| commit | c267626033afb199d0bbe49c34aad54fd0163c09 (patch) | |
| tree | d97dc0a49cb08df5dd8da8aab15322caa303fe43 | |
| parent | fd547e981727f6b2f9e643035d5251c4491cb5e7 (diff) | |
| download | isc-dhcp-c267626033afb199d0bbe49c34aad54fd0163c09.tar.gz | |
Work around Linux 2.4 Token Ring problem.
| -rw-r--r-- | common/discover.c | 5 | ||||
| -rw-r--r-- | includes/cf/linux.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/common/discover.c b/common/discover.c index b3fd8969..6c3c8d91 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" @@ -462,6 +462,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; tmp -> hw_address.hbuf [0] = ARPHRD_IEEE802; diff --git a/includes/cf/linux.h b/includes/cf/linux.h index b353bbf4..0d1e7a4e 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 |