Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-blocking BPF reads, from Guy Harris, kern/11836.

This commit is contained in:
thorpej 2000-12-29 01:55:49 +00:00
parent d7f68b8aa0
commit d2bbed89e7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/net/bpf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpf.c,v 1.59 2000/12/12 17:55:21 thorpej Exp $ */
/* $NetBSD: bpf.c,v 1.60 2000/12/29 01:55:49 thorpej Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@ -434,8 +434,13 @@ bpfread(dev, uio, ioflag)
if (d->bd_rtout != -1)
error = tsleep((caddr_t)d, PRINET|PCATCH, "bpf",
d->bd_rtout);
else
error = EWOULDBLOCK; /* User requested non-blocking I/O */
else {
if (d->bd_rtout == -1) {
/* User requested non-blocking I/O */
error = EWOULDBLOCK;
} else
error = 0;
}
if (error == EINTR || error == ERESTART) {
splx(s);
return (error);
@ -1198,9 +1203,8 @@ bpf_freed(d)
}
/*
* Attach an interface to bpf. driverp is a pointer to a (struct bpf_if *)
* in the driver's softc; dlt is the link layer type; hdrlen is the fixed
* size of the link header (variable length headers not yet supported).
* Attach an interface to bpf. dlt is the link layer type; hdrlen is the
* fixed size of the link header (variable length headers not yet supported).
*/
void
bpfattach(ifp, dlt, hdrlen)