diff options
| author | jmg <jmg@FreeBSD.org> | 2004-12-17 03:21:46 +0000 |
|---|---|---|
| committer | jmg <jmg@FreeBSD.org> | 2004-12-17 03:21:46 +0000 |
| commit | 584f9ac38a4029d76d5e57562e00788296fc1bd3 (patch) | |
| tree | c67c2d3b7765129e367750cbe1c238f89269d5da /sys/net | |
| parent | 0226dc1c6fd11d3dcb238a8ee1427aae74c8f79d (diff) | |
| download | FreeBSD-src-584f9ac38a4029d76d5e57562e00788296fc1bd3.zip FreeBSD-src-584f9ac38a4029d76d5e57562e00788296fc1bd3.tar.gz | |
don't try to recurse on the bpf lock.. kqueue already locks the bpf lock
now...
Submitted by: Ed Maste of Sandvine Inc.
MFC after: 1 week
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/bpf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 1022e87..5f313c0 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1113,7 +1113,7 @@ filt_bpfread(kn, hint) struct bpf_d *d = (struct bpf_d *)kn->kn_hook; int ready; - BPFD_LOCK(d); + BPFD_LOCK_ASSERT(d); ready = bpf_ready(d); if (ready) { kn->kn_data = d->bd_slen; @@ -1125,7 +1125,6 @@ filt_bpfread(kn, hint) bpf_timed_out, d); d->bd_state = BPF_WAITING; } - BPFD_UNLOCK(d); return (ready); } |
