Module Name: src
Committed By: ozaki-r
Date: Tue Dec 12 06:26:57 UTC 2017
Modified Files:
src/sys/net: bpf.c
Log Message:
Fix panic in callout_halt (fix typo)
Reported by wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 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.220 src/sys/net/bpf.c:1.221
--- src/sys/net/bpf.c:1.220 Thu Nov 30 20:25:55 2017
+++ src/sys/net/bpf.c Tue Dec 12 06:26:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.220 2017/11/30 20:25:55 christos Exp $ */
+/* $NetBSD: bpf.c,v 1.221 2017/12/12 06:26:57 ozaki-r Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.220 2017/11/30 20:25:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.221 2017/12/12 06:26:57 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -662,7 +662,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);
