diff options
| author |   mikeb <mikeb@openbsd.org> | 2017-05-07 17:53:30 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2017-05-07 17:53:30 +0000 |
| commit | 24bae5ed32a7c922e39e9f778f945ae2927ade56 (patch) | |
| tree | dd1ed1173e8339450e865d3ec08ac18428963038 | |
| parent | Basic implementation of the roff(7) .ta (define tab stops) request. (diff) | |
| download | wireguard-openbsd-24bae5ed32a7c922e39e9f778f945ae2927ade56.tar.xz wireguard-openbsd-24bae5ed32a7c922e39e9f778f945ae2927ade56.zip | |
Backout previous as it's causing problems on architectures that align
64 bit integers on an 8 byte boundary such as armv7. MHLEN calculation
doesn't account for padding bytes inserted by the compiler after m_hdr.
Found the hard way by kettenis@.
| -rw-r--r-- | sys/sys/mbuf.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 0e19e35c470..13765dff9e7 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.225 2017/05/03 17:51:57 mikeb Exp $ */ +/* $OpenBSD: mbuf.h,v 1.226 2017/05/07 17:53:30 mikeb Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -122,7 +122,6 @@ struct pkthdr_pf { struct pkthdr { void *ph_cookie; /* additional data */ SLIST_HEAD(, m_tag) ph_tags; /* list of packet tags */ - int64_t ph_timestamp; /* packet timestamp */ int len; /* total packet length */ u_int16_t ph_tagsset; /* mtags attached */ u_int16_t ph_flowid; /* pseudo unique flow id */ |