mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 06:15:55 +00:00
Code Issues Releases Wiki Activity

Merge errors on rt16890.

Browse Source
This commit is contained in:
David Hankins
2007-05-19 23:39:51 +00:00
parent 203ec8e289
commit 3d1cf13dac
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/bpf.c
View File

@@ -34,7 +34,7 @@
#ifndef lint #ifndef lint
static char copyright[] = 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 */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -48,6 +48,7 @@ static char copyright[] =
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <sys/uio.h> # include <sys/uio.h>
# include <net/bpf.h> # include <net/bpf.h>
# include <net/if_types.h>
# if defined (NEED_OSF_PFILT_HACKS) # if defined (NEED_OSF_PFILT_HACKS)
# include <net/pfilt.h> # include <net/pfilt.h>
# endif # endif
@@ -602,7 +603,7 @@ get_hw_addr(const char *name, struct hardware *hw) {
#endif /* IFT_FDDI */ #endif /* IFT_FDDI */
default: default:
log_fatal("Unsupported device type %d for \"%s\"", log_fatal("Unsupported device type %d for \"%s\"",
sa->sa_family, name); sa->sdl_type, name);
} }
freeifaddrs(ifa); freeifaddrs(ifa);