[src/netbsd-7]: src/external/bsd/dhcp/dist/common Pull up following revision(...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fcd845ae1cbc
branches:  netbsd-7
changeset: 800487:fcd845ae1cbc
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jun 06 15:31:58 2018 +0000

description:
Pull up following revision(s) (requested by maya in ticket #1611):

        external/mpl/dhcp/dist/common/bpf.c: revision 1.3
        (via patch, applied to src/external/bsd/dhcp/dist/common/bpf.c)

PR/50893: Bruce Lilly: Handle carp interfaces.

XXX: pullup-8 (in src/external/bsd/dhcp/dist/common/bpf.c)

diffstat:

 external/bsd/dhcp/dist/common/bpf.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 2d3dfbf9cb47 -r fcd845ae1cbc external/bsd/dhcp/dist/common/bpf.c
--- a/external/bsd/dhcp/dist/common/bpf.c       Wed Jun 06 15:15:01 2018 +0000
+++ b/external/bsd/dhcp/dist/common/bpf.c       Wed Jun 06 15:31:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bpf.c,v 1.3 2014/07/12 12:09:37 spz Exp $      */
+/*     $NetBSD: bpf.c,v 1.3.2.1 2018/06/06 15:31:58 martin Exp $       */
 /* bpf.c
 
    BPF socket interface code, originally contributed by Archie Cobbs. */
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: bpf.c,v 1.3 2014/07/12 12:09:37 spz Exp $");
+__RCSID("$NetBSD: bpf.c,v 1.3.2.1 2018/06/06 15:31:58 martin Exp $");
 
 #include "dhcpd.h"
 #if defined (USE_BPF_SEND) || defined (USE_BPF_RECEIVE)        \
@@ -623,6 +623,9 @@
         */
         switch (sa->sdl_type) {
                 case IFT_ETHER:
+#ifdef IFT_CARP
+                       case IFT_CARP:
+#endif
                         hw->hlen = sa->sdl_alen + 1;
                         hw->hbuf[0] = HTYPE_ETHER;
                         memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);