From: Arnd Bergmann Date: Thu, 4 Feb 2021 16:28:04 +0000 (+0100) Subject: mwl8k: fix alignment constraints X-Git-Tag: io_uring-worker.v3-2021-02-25~99^2~62^2~19 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=bfdc4d7cbe57276e60b21091976a56f38a090635;p=linux-2.6-block.git mwl8k: fix alignment constraints sturct mwl8k_dma_data contains a ieee80211_hdr structure, which is required to have at least two byte alignment, and this conflicts with the __packed attribute: vers/net/wireless/marvell/mwl8k.c:811:1: warning: alignment 1 of 'struct mwl8k_dma_data' is less than 2 [-Wpacked-not-aligned] Mark mwl8k_dma_data itself as having two-byte alignment to ensure the inner structure is properly aligned. Signed-off-by: Arnd Bergmann Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210204162813.3159319-1-arnd@kernel.org --- diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c index 435ef77227ab..c9f8c056aa51 100644 --- a/drivers/net/wireless/marvell/mwl8k.c +++ b/drivers/net/wireless/marvell/mwl8k.c @@ -808,7 +808,7 @@ struct mwl8k_dma_data { __le16 fwlen; struct ieee80211_hdr wh; char data[]; -} __packed; +} __packed __aligned(2); /* Routines to add/remove DMA header from skb. */ static inline void mwl8k_remove_dma_header(struct sk_buff *skb, __le16 qos)