diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2013-11-01 20:53:49 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2013-11-01 20:53:49 +0000 |
| commit | a09968c47940d3b0e9e82ce7c06faec3f42cea94 (patch) | |
| tree | 4b751065cfb2e75691de789fa9ad8e50b92e65d3 | |
| parent | 760eb697b475c0e58e3dfcf45ca4d9ec13bcbb8e (diff) | |
Notes
| -rw-r--r-- | sys/dev/random/harvest.c | 2 | ||||
| -rw-r--r-- | sys/net/bpf.c | 2 | ||||
| -rw-r--r-- | sys/net/if_ethersubr.c | 2 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 2 | ||||
| -rw-r--r-- | sys/sys/random.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c index 9c10e8dca338..9dbae8449b35 100644 --- a/sys/dev/random/harvest.c +++ b/sys/dev/random/harvest.c @@ -86,7 +86,7 @@ randomdev_deinit_harvester(void) * read which can be quite expensive. */ void -random_harvest(void *entropy, u_int count, u_int bits, enum esource origin) +random_harvest(const void *entropy, u_int count, u_int bits, enum esource origin) { if (reap_func) (*reap_func)(get_cyclecount(), entropy, count, bits, origin); diff --git a/sys/net/bpf.c b/sys/net/bpf.c index add10bf3469c..d9686e8a4b42 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -577,7 +577,7 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp, goto bad; } } - bcopy(m->m_data, sockp->sa_data, hlen); + bcopy(mtod(m, const void *), sockp->sa_data, hlen); } *hdrlen = hlen; diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index c4a9125c9f45..6d1668c02c29 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -642,7 +642,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m) } if (harvest.ethernet) - random_harvest(&(m->m_data), 12, 2, RANDOM_NET_ETHER); + random_harvest(mtod(m, const void *), 12, 2, RANDOM_NET_ETHER); ether_demux(ifp, m); CURVNET_RESTORE(); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index ddef6f90d207..13aef2a18b9d 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -919,7 +919,7 @@ tunwrite(struct cdev *dev, struct uio *uio, int flag) return (EAFNOSUPPORT); } if (harvest.point_to_point) - random_harvest(&(m->m_data), 12, 2, RANDOM_NET_TUN); + random_harvest(mtod(m, const void *), 12, 2, RANDOM_NET_TUN); ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; CURVNET_SET(ifp->if_vnet); diff --git a/sys/sys/random.h b/sys/sys/random.h index 0f26b8b2b90d..9fee143751b8 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -58,7 +58,7 @@ enum esource { RANDOM_PURE_RNDTEST, ENTROPYSOURCE }; -void random_harvest(void *, u_int, u_int, enum esource); +void random_harvest(const void *, u_int, u_int, enum esource); /* Allow the sysadmin to select the broad category of * entropy types to harvest |