From 3d1cf13dac6b6233f035f9eabc5bf5f268d9060f Mon Sep 17 00:00:00 2001
From: David Hankins <dhankins@isc.org>
Date: Sat, 19 May 2007 23:39:51 +0000
Subject: [PATCH] Merge errors on rt16890.

---
 common/bpf.c | 5 +++--
 1 file 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);