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

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

details:   https://anonhg.NetBSD.org/src/rev/f8a77ba2f3ac
branches:  netbsd-8
changeset: 435033:f8a77ba2f3ac
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jun 08 10:18:36 2018 +0000

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

        external/mpl/dhcp/dist/common/bpf.c: revision 1.3

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 dfd13a53d3d6 -r f8a77ba2f3ac external/bsd/dhcp/dist/common/bpf.c
--- a/external/bsd/dhcp/dist/common/bpf.c       Fri Jun 08 10:14:33 2018 +0000
+++ b/external/bsd/dhcp/dist/common/bpf.c       Fri Jun 08 10:18:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bpf.c,v 1.4 2016/01/10 20:10:44 christos Exp $ */
+/*     $NetBSD: bpf.c,v 1.4.8.1 2018/06/08 10:18:36 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.4 2016/01/10 20:10:44 christos Exp $");
+__RCSID("$NetBSD: bpf.c,v 1.4.8.1 2018/06/08 10:18:36 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
 #if defined (IFT_L2VLAN)
                case IFT_L2VLAN:
 #endif