[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by ozaki...

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

details:   https://anonhg.NetBSD.org/src/rev/89f8372ea2d1
branches:  netbsd-8
changeset: 434503:89f8372ea2d1
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Dec 21 21:38:23 2017 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #446):
        sys/net/bpf.c: revision 1.221
Fix panic in callout_halt (fix typo)
Reported by wiz@

diffstat:

 sys/net/bpf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 32280cb8d295 -r 89f8372ea2d1 sys/net/bpf.c
--- a/sys/net/bpf.c     Thu Dec 21 21:37:03 2017 +0000
+++ b/sys/net/bpf.c     Thu Dec 21 21:38:23 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bpf.c,v 1.216.6.1 2017/10/25 07:14:09 snj Exp $        */
+/*     $NetBSD: bpf.c,v 1.216.6.2 2017/12/21 21:38:23 snj Exp $        */
 
 /*
  * Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216.6.1 2017/10/25 07:14:09 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.216.6.2 2017/12/21 21:38:23 snj Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
@@ -665,7 +665,7 @@
 
        mutex_enter(d->bd_mtx);
        if (d->bd_state == BPF_WAITING)
-               callout_halt(&d->bd_callout, d->bd_buf_mtx);
+               callout_halt(&d->bd_callout, d->bd_mtx);
        timed_out = (d->bd_state == BPF_TIMED_OUT);
        d->bd_state = BPF_IDLE;
        mutex_exit(d->bd_mtx);