wifi: mt76: mt7925: ensure 4-byte alignment for suspend & wow command

[ Upstream commit fa46bd62c9a8ab195d9c5108a91abf0680fec10e ]

Before sending suspend & wow command to FW, its length should be
4-bytes alignd.

Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt7925 chips")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index ae19174b46ee505daa356a65277a17eaf01a5919..5809555a909d7eff8bab9940de8ec907e203f847 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2524,6 +2524,7 @@ int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend)
                        __le16 tag;
                        __le16 len;
                        u8 suspend;
+                       u8 pad[7];
                } __packed hif_suspend;
        } req = {
                .hif_suspend = {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
index 2cf39276118eba458fdea2d0e96fff052d28518d..1599338e06310aa505b23ea4afc12379e96e2af8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
@@ -535,7 +535,7 @@ struct mt7925_wow_pattern_tlv {
        u8 offset;
        u8 mask[MT76_CONNAC_WOW_MASK_MAX_LEN];
        u8 pattern[MT76_CONNAC_WOW_PATTEN_MAX_LEN];
-       u8 rsv[4];
+       u8 rsv[7];
 } __packed;
 
 static inline enum connac3_mcu_cipher_type