summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason <jason@openbsd.org>2003-08-14 15:20:29 +0000
committerjason <jason@openbsd.org>2003-08-14 15:20:29 +0000
commitecb91a46bdc1ad9f2aa68f50c6abffc4d8be7504 (patch)
tree581695b06deb7814bfbc47c98cc7905fb8efc1ff
parentmirror change in mbufs: cuio_copyback's 4th arg is now const void * (diff)
downloadwireguard-openbsd-ecb91a46bdc1ad9f2aa68f50c6abffc4d8be7504.tar.xz
wireguard-openbsd-ecb91a46bdc1ad9f2aa68f50c6abffc4d8be7504.zip
kill unneeded caddr_t casts for *_copyback
-rw-r--r--sys/dev/pci/hifn7751.c6
-rw-r--r--sys/dev/pci/ubsec.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 3f4fc02cd83..a629cc20f50 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
+/* $OpenBSD: hifn7751.c,v 1.141 2003/08/14 15:20:29 jason Exp $ */
/*
* Invertex AEON / Hifn 7751 driver
@@ -2202,11 +2202,11 @@ hifn_callback(struct hifn_softc *sc, struct hifn_command *cmd,
if (crp->crp_flags & CRYPTO_F_IMBUF)
m_copyback((struct mbuf *)crp->crp_buf,
cmd->src_map->dm_mapsize - cmd->sloplen,
- cmd->sloplen, (caddr_t)&dma->slop[cmd->slopidx]);
+ cmd->sloplen, &dma->slop[cmd->slopidx]);
else if (crp->crp_flags & CRYPTO_F_IOV)
cuio_copyback((struct uio *)crp->crp_buf,
cmd->src_map->dm_mapsize - cmd->sloplen,
- cmd->sloplen, (caddr_t)&dma->slop[cmd->slopidx]);
+ cmd->sloplen, &dma->slop[cmd->slopidx]);
}
i = dma->dstk; u = dma->dstu;
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 8ce649712d0..b7d0da12975 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.129 2003/08/08 02:55:17 jason Exp $ */
+/* $OpenBSD: ubsec.c,v 1.130 2003/08/14 15:20:29 jason Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -848,11 +848,11 @@ ubsec_process(struct cryptop *crp)
if (crp->crp_flags & CRYPTO_F_IMBUF)
m_copyback(q->q_src_m,
enccrd->crd_inject,
- 8, (caddr_t)ctx.pc_iv);
+ 8, ctx.pc_iv);
else if (crp->crp_flags & CRYPTO_F_IOV)
cuio_copyback(q->q_src_io,
enccrd->crd_inject,
- 8, (caddr_t)ctx.pc_iv);
+ 8, ctx.pc_iv);
}
} else {
ctx.pc_flags |= htole16(UBS_PKTCTX_INBOUND);
@@ -1282,7 +1282,7 @@ ubsec_callback(struct ubsec_softc *sc, struct ubsec_q *q)
if (crp->crp_flags & CRYPTO_F_IMBUF)
m_copyback((struct mbuf *)crp->crp_buf,
crd->crd_inject, 12,
- (caddr_t)dmap->d_dma->d_macbuf);
+ dmap->d_dma->d_macbuf);
else if (crp->crp_flags & CRYPTO_F_IOV && crp->crp_mac)
bcopy((caddr_t)dmap->d_dma->d_macbuf,
crp->crp_mac, 12);