si_ -> sel_
This commit is contained in:
parent
09dfaace39
commit
f5ff34bbc6
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: fifo_vnops.c,v 1.36 2002/10/23 09:14:35 jdolecek Exp $ */
|
||||
/* $NetBSD: fifo_vnops.c,v 1.37 2002/11/26 19:01:55 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1993, 1995
|
||||
@ -36,7 +36,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.36 2002/10/23 09:14:35 jdolecek Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.37 2002/11/26 19:01:55 christos Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -519,8 +519,8 @@ filt_fifordetach(struct knote *kn)
|
||||
struct socket *so;
|
||||
|
||||
so = (struct socket *)kn->kn_hook;
|
||||
SLIST_REMOVE(&so->so_rcv.sb_sel.si_klist, kn, knote, kn_selnext);
|
||||
if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_klist))
|
||||
SLIST_REMOVE(&so->so_rcv.sb_sel.sel_klist, kn, knote, kn_selnext);
|
||||
if (SLIST_EMPTY(&so->so_rcv.sb_sel.sel_klist))
|
||||
so->so_rcv.sb_flags &= ~SB_KNOTE;
|
||||
}
|
||||
|
||||
@ -545,8 +545,8 @@ filt_fifowdetach(struct knote *kn)
|
||||
struct socket *so;
|
||||
|
||||
so = (struct socket *)kn->kn_hook;
|
||||
SLIST_REMOVE(&so->so_snd.sb_sel.si_klist, kn, knote, kn_selnext);
|
||||
if (SLIST_EMPTY(&so->so_snd.sb_sel.si_klist))
|
||||
SLIST_REMOVE(&so->so_snd.sb_sel.sel_klist, kn, knote, kn_selnext);
|
||||
if (SLIST_EMPTY(&so->so_snd.sb_sel.sel_klist))
|
||||
so->so_snd.sb_flags &= ~SB_KNOTE;
|
||||
}
|
||||
|
||||
@ -597,7 +597,7 @@ fifo_kqfilter(void *v)
|
||||
|
||||
ap->a_kn->kn_hook = so;
|
||||
|
||||
SLIST_INSERT_HEAD(&sb->sb_sel.si_klist, ap->a_kn, kn_selnext);
|
||||
SLIST_INSERT_HEAD(&sb->sb_sel.sel_klist, ap->a_kn, kn_selnext);
|
||||
sb->sb_flags |= SB_KNOTE;
|
||||
return (0);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bpf.c,v 1.75 2002/10/23 09:14:41 jdolecek Exp $ */
|
||||
/* $NetBSD: bpf.c,v 1.76 2002/11/26 18:51:18 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1991, 1993
|
||||
@ -43,7 +43,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.75 2002/10/23 09:14:41 jdolecek Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.76 2002/11/26 18:51:18 christos Exp $");
|
||||
|
||||
#include "bpfilter.h"
|
||||
|
||||
@ -536,7 +536,7 @@ bpf_wakeup(d)
|
||||
|
||||
selnotify(&d->bd_sel, 0);
|
||||
/* XXX */
|
||||
d->bd_sel.si_pid = 0;
|
||||
d->bd_sel.sel_pid = 0;
|
||||
}
|
||||
|
||||
int
|
||||
@ -1067,7 +1067,7 @@ filt_bpfrdetach(struct knote *kn)
|
||||
int s;
|
||||
|
||||
s = splnet();
|
||||
SLIST_REMOVE(&d->bd_sel.si_klist, kn, knote, kn_selnext);
|
||||
SLIST_REMOVE(&d->bd_sel.sel_klist, kn, knote, kn_selnext);
|
||||
splx(s);
|
||||
}
|
||||
|
||||
@ -1096,7 +1096,7 @@ bpfkqfilter(dev, kn)
|
||||
|
||||
switch (kn->kn_filter) {
|
||||
case EVFILT_READ:
|
||||
klist = &d->bd_sel.si_klist;
|
||||
klist = &d->bd_sel.sel_klist;
|
||||
kn->kn_fop = &bpfread_filtops;
|
||||
break;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_tun.c,v 1.56 2002/10/23 09:14:42 jdolecek Exp $ */
|
||||
/* $NetBSD: if_tun.c,v 1.57 2002/11/26 18:51:19 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.56 2002/10/23 09:14:42 jdolecek Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.57 2002/11/26 18:51:19 christos Exp $");
|
||||
|
||||
#include "tun.h"
|
||||
|
||||
@ -932,7 +932,7 @@ filt_tunrdetach(struct knote *kn)
|
||||
int s;
|
||||
|
||||
s = splnet();
|
||||
SLIST_REMOVE(&tp->tun_rsel.si_klist, kn, knote, kn_selnext);
|
||||
SLIST_REMOVE(&tp->tun_rsel.sel_klist, kn, knote, kn_selnext);
|
||||
splx(s);
|
||||
}
|
||||
|
||||
@ -973,12 +973,12 @@ tunkqfilter(dev_t dev, struct knote *kn)
|
||||
|
||||
switch (kn->kn_filter) {
|
||||
case EVFILT_READ:
|
||||
klist = &tp->tun_rsel.si_klist;
|
||||
klist = &tp->tun_rsel.sel_klist;
|
||||
kn->kn_fop = &tunread_filtops;
|
||||
break;
|
||||
|
||||
case EVFILT_WRITE:
|
||||
klist = &tp->tun_rsel.si_klist;
|
||||
klist = &tp->tun_rsel.sel_klist;
|
||||
kn->kn_fop = &tun_seltrue_filtops;
|
||||
break;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user