From 899e63284eb947de8512754ac2c7c8cae4e8b2ad Mon Sep 17 00:00:00 2001
From: Ayoub Kaanich <kayoub5@live.com>
Date: Sun, 9 May 2021 01:01:48 +0200
Subject: [PATCH] can: allow can_frame and canfd_frame to share the same flags

---
 include/linux/can.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/can.h b/include/linux/can.h
index 7b8e0c1..b49bc70 100644
--- a/include/linux/can.h
+++ b/include/linux/can.h
@@ -114,14 +114,14 @@ struct can_frame {
 		__u8 len;
 		__u8 can_dlc; /* deprecated */
 	};
-	__u8 __pad; /* padding */
+	__u8 flags; /* additional flags */
 	__u8 __res0; /* reserved / padding */
 	__u8 len8_dlc; /* optional DLC for 8 byte payload length (9 .. 15) */
 	__u8 data[CAN_MAX_DLEN] __attribute__((aligned(8)));
 };
 
 /*
- * defined bits for canfd_frame.flags
+ * defined bits for canfd_frame.flags and can_frame.flags
  *
  * The use of struct canfd_frame implies the Extended Data Length (EDL) bit to
  * be set in the CAN frame bitstream on the wire. The EDL bit switch turns