From a029a69c5505d0f335bb1f3a74b0da22cb30da19 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 3 Jan 2019 14:47:00 -0500
Subject: [PATCH] freebsd_network: Properly align mbuf members.

---
 src/libs/compat/freebsd_network/compat/sys/mbuf.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libs/compat/freebsd_network/compat/sys/mbuf.h b/src/libs/compat/freebsd_network/compat/sys/mbuf.h
index 4401aa3163..fe3cd396ee 100644
--- a/src/libs/compat/freebsd_network/compat/sys/mbuf.h
+++ b/src/libs/compat/freebsd_network/compat/sys/mbuf.h
@@ -250,19 +250,16 @@ struct mbuf {
 	int32_t		 m_len;		/* amount of data in this mbuf */
 	uint32_t	 m_type:8,	/* type of data in this mbuf */
 			 m_flags:24;
-#if !defined(__LP64__)
-	uint32_t	 m_pad;		/* pad for 64bit alignment */
-#endif
 
 	union {
 		struct {
 			struct pkthdr	MH_pkthdr;
 			union {
 				struct m_ext	MH_ext;
-				char			MH_databuf[0];
+				char			MH_databuf[0] __aligned(8);
 			} MH_dat;
 		} MH;
-		char M_databuf[0];
+		char M_databuf[0] __aligned(8);
 	} M_dat;
 };