diff options
| author | adrian <adrian@FreeBSD.org> | 2013-11-02 15:13:02 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2013-11-02 15:13:02 +0000 |
| commit | 900b03bfd292638d49e1ac08220d42da9964a1ec (patch) | |
| tree | a5826a63d5a5fcab79d6b7e3682f584e168f9cb0 /sys/net | |
| parent | f6c0af936d16e5b05a41713fcf6b118e873e5217 (diff) | |
| download | FreeBSD-src-900b03bfd292638d49e1ac08220d42da9964a1ec.zip FreeBSD-src-900b03bfd292638d49e1ac08220d42da9964a1ec.tar.gz | |
Restore the entropy gathering from the m_data pointer value, not the
m_data payload.
After talking with markm/bde, this is what markm actually intended.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_ethersubr.c | 2 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 6d1668c..c4a9125 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(mtod(m, const void *), 12, 2, RANDOM_NET_ETHER); + random_harvest(&(m->m_data), 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 13aef2a..ddef6f9 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(mtod(m, const void *), 12, 2, RANDOM_NET_TUN); + random_harvest(&(m->m_data), 12, 2, RANDOM_NET_TUN); ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; CURVNET_SET(ifp->if_vnet); |
