diff options
| author | cube <cube@pkgsrc.org> | 2005-01-25 10:26:52 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2005-01-25 10:26:52 +0000 |
| commit | 376b560c69369a8dd7dab6b93f6e3b72ffcff4ce (patch) | |
| tree | efbe6c589c42c07b61f335a4264a03cdb62c566d /net/netbsd-tap | |
| parent | b82b496f248edd66c72cdbfb7987556088d2eb0e (diff) | |
| download | pkgsrc-376b560c69369a8dd7dab6b93f6e3b72ffcff4ce.tar.gz | |
Report revision 1.4 from main tree.
Do not cast simple_lock() to (void). It may be a do { } while() macro,
and then compilation fails. Found by Håvard Eidnes.
Diffstat (limited to 'net/netbsd-tap')
| -rw-r--r-- | net/netbsd-tap/files/if_tap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/netbsd-tap/files/if_tap.c b/net/netbsd-tap/files/if_tap.c index 2cb8203f2c9..5b8e6aaaa0a 100644 --- a/net/netbsd-tap/files/if_tap.c +++ b/net/netbsd-tap/files/if_tap.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tap.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $ */ +/* $NetBSD: if_tap.c,v 1.2 2005/01/25 10:26:52 cube Exp $ */ /* * Copyright (c) 2003, 2004 The NetBSD Foundation. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.2 2005/01/25 10:26:52 cube Exp $"); #if defined(_KERNEL_OPT) #include "bpfilter.h" @@ -1092,7 +1092,7 @@ tap_dev_poll(int unit, int events, struct proc *p) if (m != NULL) revents |= events & (POLLIN|POLLRDNORM); else { - (void)simple_lock(&sc->sc_kqlock); + simple_lock(&sc->sc_kqlock); selrecord(p, &sc->sc_rsel); simple_unlock(&sc->sc_kqlock); } @@ -1140,7 +1140,7 @@ tap_dev_kqfilter(int unit, struct knote *kn) } kn->kn_hook = sc; - (void)simple_lock(&sc->sc_kqlock); + simple_lock(&sc->sc_kqlock); SLIST_INSERT_HEAD(&sc->sc_rsel.sel_klist, kn, kn_selnext); simple_unlock(&sc->sc_kqlock); return (0); @@ -1151,7 +1151,7 @@ tap_kqdetach(struct knote *kn) { struct tap_softc *sc = (struct tap_softc *)kn->kn_hook; - (void)simple_lock(&sc->sc_kqlock); + simple_lock(&sc->sc_kqlock); SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext); simple_unlock(&sc->sc_kqlock); } |