From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 14 Apr 2021 02:14:34 +0000 (-0700)
Subject: uapi: update can.h
X-Git-Tag: v5.12.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc718c191b66389e192d9e243152664fa7dd2752;p=thirdparty%2Fiproute2.git

uapi: update can.h

Upstream commit to force packing on ARM OABI

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h
index d7d56e408..5e1d3838c 100644
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
@@ -113,7 +113,7 @@ struct can_frame {
 		 */
 		__u8 len;
 		__u8 can_dlc; /* deprecated */
-	};
+	} __attribute__((packed)); /* disable padding added in some ABIs */
 	__u8 __pad; /* padding */
 	__u8 __res0; /* reserved / padding */
 	__u8 len8_dlc; /* optional DLC for 8 byte payload length (9 .. 15) */