Module Name: src
Committed By: martin
Date: Wed Jun 6 15:31:58 UTC 2018
Modified Files:
src/external/bsd/dhcp/dist/common [netbsd-7]: bpf.c
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/dhcp/dist/common/bpf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/common/bpf.c
diff -u src/external/bsd/dhcp/dist/common/bpf.c:1.3 src/external/bsd/dhcp/dist/common/bpf.c:1.3.2.1
--- src/external/bsd/dhcp/dist/common/bpf.c:1.3 Sat Jul 12 12:09:37 2014
+++ src/external/bsd/dhcp/dist/common/bpf.c Wed Jun 6 15:31:58 2018
@@ -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 @@ get_hw_addr(const char *name, struct har
*/
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);
