mt76: connac: fix mt76_connac_gtk_rekey_tlv usage

[ Upstream commit d741abeafa47a7331cd4fe526e44db4ad3da0f62 ]

The mistaken structure is introduced since we added the GTK rekey offload
to mt7663. The patch fixes mt76_connac_gtk_rekey_tlv structure according
to the MT7663 and MT7921 firmware we have submitted into
linux-firmware.git.

Fixes: b47e21e75c80 ("mt76: mt7615: add gtk rekey offload support")
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Leon Yen <Leon.Yen@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.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 1c73beb22677190f6916c529bee7ca05a40e2fe5..4bcd728ff97c57f79481ae2008d152a16875abec 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -844,14 +844,14 @@ struct mt76_connac_gtk_rekey_tlv {
                        * 2: rekey update
                        */
        u8 keyid;
-       u8 pad[2];
+       u8 option; /* 1: rekey data update without enabling offload */
+       u8 pad[1];
        __le32 proto; /* WPA-RSN-WAPI-OPSN */
        __le32 pairwise_cipher;
        __le32 group_cipher;
        __le32 key_mgmt; /* NONE-PSK-IEEE802.1X */
        __le32 mgmt_group_cipher;
-       u8 option; /* 1: rekey data update without enabling offload */
-       u8 reserverd[3];
+       u8 reserverd[4];
 } __packed;
 
 #define MT76_CONNAC_WOW_MASK_MAX_LEN                   16