Commit 27868a8f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Marc Kleine-Budde
Browse files

can: ucan: fix alignment constraints 

struct ucan_message_in contains member with 4-byte alignment
but is itself marked as unaligned, which triggers a warning:

drivers/net/can/usb/ucan.c:249:1: warning: alignment 1 of 'struct ucan_message_in' is less than 4 [-Wpacked-not-aligned]

Mark the outer structure to have the same alignment as the inner
one.

Link: https://lore.kernel.org/r/20210204162625.3099392-1-arnd@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent a3497afb

drivers/net/can/usb/ucan.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ struct ucan_message_in { 
		 */

		struct ucan_tx_complete_entry_t can_tx_complete_msg[0];

	} __aligned(0x4) msg;

} __packed;

} __packed __aligned(0x4);



/* Macros to calculate message lengths */

#define UCAN_OUT_HDR_SIZE offsetof(struct ucan_message_out, msg)