uiomove-related caddr_t -> void * (just the low-hanging fruit)

3 files changed, 6 insertions, 6 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index df210e2..7c56ef6 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -228,11 +228,11 @@ bpf_movein(uio, linktype, mp, sockp, datlen)
 #else
 		m->m_off += hlen;
 #endif
-		error = uiomove((caddr_t)sockp->sa_data, hlen, uio);
+		error = uiomove(sockp->sa_data, hlen, uio);
 		if (error)
 			goto bad;
 	}
-	error = uiomove(mtod(m, caddr_t), len - hlen, uio);
+	error = uiomove(mtod(m, void *), len - hlen, uio);
 	if (!error)
 		return (0);
 bad:
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index ee7124a..7c93412 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -794,7 +794,7 @@ tapread(dev, uio, flag)
 		if (len == 0)
 			break;
 
-		error = uiomove(mtod(m, caddr_t), len, uio);
+		error = uiomove(mtod(m, void *), len, uio);
 		m = m_free(m);
 	}
 
@@ -848,7 +848,7 @@ tapwrite(dev, uio, flag)
 	mp = ⊤
 	while ((error == 0) && (uio->uio_resid > 0)) {
 		m->m_len = min(mlen, uio->uio_resid);
-		error = uiomove(mtod(m, caddr_t), m->m_len, uio);
+		error = uiomove(mtod(m, void *), m->m_len, uio);
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 4de15ec..9de302f 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -676,7 +676,7 @@ tunread(dev_t dev, struct uio *uio, int flag)
 	while (m && uio->uio_resid > 0 && error == 0) {
 		len = min(uio->uio_resid, m->m_len);
 		if (len != 0)
-			error = uiomove(mtod(m, caddr_t), len, uio);
+			error = uiomove(mtod(m, void *), len, uio);
 		m = m_free(m);
 	}
 
@@ -725,7 +725,7 @@ tunwrite(dev_t dev, struct uio *uio, int flag)
 	mp = ⊤
 	while (error == 0 && uio->uio_resid > 0) {
 		m->m_len = min(mlen, uio->uio_resid);
-		error = uiomove(mtod (m, caddr_t), m->m_len, uio);
+		error = uiomove(mtod(m, void *), m->m_len, uio);
 		*mp = m;
 		mp = &m->m_next;
 		if (uio->uio_resid > 0) {