diff options
| author | des <des@FreeBSD.org> | 2003-03-02 16:54:40 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-03-02 16:54:40 +0000 |
| commit | 2756b6c9641bd9899a346582c191310de25cccc5 (patch) | |
| tree | 351747321ab136aa733f670c4c2c235b3639bc1e /sys/net | |
| parent | 3780674329cabab230b12923047c8aa84e4f05fc (diff) | |
| download | FreeBSD-src-2756b6c9641bd9899a346582c191310de25cccc5.zip FreeBSD-src-2756b6c9641bd9899a346582c191310de25cccc5.tar.gz | |
More low-hanging fruit: kill caddr_t in calls to wakeup(9) / [mt]sleep(9).
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/bpf.c | 4 | ||||
| -rw-r--r-- | sys/net/if_tap.c | 4 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 71c98aa..bc13b59 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -457,7 +457,7 @@ bpfread(dev, uio, ioflag) BPFD_UNLOCK(d); return (EWOULDBLOCK); } - error = msleep((caddr_t)d, &d->bd_mtx, PRINET|PCATCH, + error = msleep(d, &d->bd_mtx, PRINET|PCATCH, "bpf", d->bd_rtout); if (error == EINTR || error == ERESTART) { BPFD_UNLOCK(d); @@ -518,7 +518,7 @@ bpf_wakeup(d) callout_stop(&d->bd_callout); d->bd_state = BPF_IDLE; } - wakeup((caddr_t)d); + wakeup(d); if (d->bd_async && d->bd_sig && d->bd_sigio) pgsigio(&d->bd_sigio, d->bd_sig, 0); diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index f35d578..388ca60 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -607,7 +607,7 @@ tapifstart(ifp) if (ifp->if_snd.ifq_len != 0) { if (tp->tap_flags & TAP_RWAIT) { tp->tap_flags &= ~TAP_RWAIT; - wakeup((caddr_t)tp); + wakeup(tp); } if ((tp->tap_flags & TAP_ASYNC) && (tp->tap_sigio != NULL)) @@ -779,7 +779,7 @@ tapread(dev, uio, flag) return (EWOULDBLOCK); tp->tap_flags |= TAP_RWAIT; - error = tsleep((caddr_t)tp,PCATCH|(PZERO+1),"taprd",0); + error = tsleep(tp,PCATCH|(PZERO+1),"taprd",0); if (error) return (error); } diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 315fa77..1c7d61e 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -211,7 +211,7 @@ tunstart(struct ifnet *ifp) if (tp->tun_flags & TUN_RWAIT) { tp->tun_flags &= ~TUN_RWAIT; - wakeup((caddr_t)tp); + wakeup(tp); } if (tp->tun_flags & TUN_ASYNC && tp->tun_sigio) pgsigio(&tp->tun_sigio, SIGIO, 0); @@ -664,7 +664,7 @@ tunread(dev_t dev, struct uio *uio, int flag) return (EWOULDBLOCK); } tp->tun_flags |= TUN_RWAIT; - if((error = tsleep((caddr_t)tp, PCATCH | (PZERO + 1), + if((error = tsleep(tp, PCATCH | (PZERO + 1), "tunread", 0)) != 0) { splx(s); return (error); |
