* [PATCH] cwmwl8k: fix alignment constraints
@ 2021-02-04 16:28 Arnd Bergmann
2021-02-08 11:23 ` mwl8k: " Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2021-02-04 16:28 UTC (permalink / raw)
To: Lennert Buytenhek, Kalle Valo, David S. Miller, Jakub Kicinski
Cc: Arnd Bergmann, Gustavo A. R. Silva, Romain Perier,
Christophe JAILLET, Allen Pais, linux-wireless, netdev,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
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 <arnd@arndb.de>
---
drivers/net/wireless/marvell/mwl8k.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c
index abf3b0233ccc..38eeab6369f7 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)
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: mwl8k: fix alignment constraints
2021-02-04 16:28 [PATCH] cwmwl8k: fix alignment constraints Arnd Bergmann
@ 2021-02-08 11:23 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2021-02-08 11:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Lennert Buytenhek, David S. Miller, Jakub Kicinski,
Arnd Bergmann, Gustavo A. R. Silva, Romain Perier,
Christophe JAILLET, Allen Pais, linux-wireless, netdev,
linux-kernel
Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <arnd@arndb.de>
Patch applied to wireless-drivers-next.git, thanks.
bfdc4d7cbe57 mwl8k: fix alignment constraints
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210204162813.3159319-1-arnd@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-08 11:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-04 16:28 [PATCH] cwmwl8k: fix alignment constraints Arnd Bergmann
2021-02-08 11:23 ` mwl8k: " Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).