Module Name: src
Committed By: snj
Date: Thu Dec 21 21:38:23 UTC 2017
Modified Files:
src/sys/net [netbsd-8]: bpf.c
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.216.6.1 -r1.216.6.2 src/sys/net/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/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.216.6.1 src/sys/net/bpf.c:1.216.6.2
--- src/sys/net/bpf.c:1.216.6.1 Wed Oct 25 07:14:09 2017
+++ src/sys/net/bpf.c Thu Dec 21 21:38:23 2017
@@ -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 @@ bpf_read(struct file *fp, off_t *offp, s
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);
