diff options
| author | David Hankins <dhankins@isc.org> | 2007-05-19 23:39:51 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2007-05-19 23:39:51 +0000 |
| commit | 3d1cf13dac6b6233f035f9eabc5bf5f268d9060f (patch) | |
| tree | 43ec4502b4ef7cd3fb4ac644d25558e5d71dad8c | |
| parent | 203ec8e289d5cdf859f77143421e658cfef4d91a (diff) | |
| download | isc-dhcp-4_0_0a1.tar.gz | |
Merge errors on rt16890.v4_0_0a1
| -rw-r--r-- | common/bpf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/bpf.c b/common/bpf.c index 93db6ccc..39a54152 100644 --- a/common/bpf.c +++ b/common/bpf.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: bpf.c,v 1.56 2007/05/19 23:28:38 dhankins Exp $ Copyright (c) 2004,2007 Internet Systems Consortium. All rights reserved.\n"; +"$Id: bpf.c,v 1.57 2007/05/19 23:39:51 dhankins Exp $ Copyright (c) 2004,2007 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -48,6 +48,7 @@ static char copyright[] = # include <sys/ioctl.h> # include <sys/uio.h> # include <net/bpf.h> +# include <net/if_types.h> # if defined (NEED_OSF_PFILT_HACKS) # include <net/pfilt.h> # endif @@ -602,7 +603,7 @@ get_hw_addr(const char *name, struct hardware *hw) { #endif /* IFT_FDDI */ default: log_fatal("Unsupported device type %d for \"%s\"", - sa->sa_family, name); + sa->sdl_type, name); } freeifaddrs(ifa); |