summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
diff options
context:
space:
mode:
authorRyder Lee <ryder.lee@mediatek.com>2021-06-17 15:17:49 +0800
committerFelix Fietkau <nbd@nbd.name>2021-06-19 09:22:51 +0200
commitc368362c36d3d4cedbc9a1c9caa95960912cc429 (patch)
tree38dee1ade846cdce8e09bdc55967f4467d4c52f5 /drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
parent723885a6750102e5d807429b3d06aa6b0d29cc66 (diff)
downloadlinux-stable-c368362c36d3d4cedbc9a1c9caa95960912cc429.tar.gz
linux-stable-c368362c36d3d4cedbc9a1c9caa95960912cc429.tar.bz2
linux-stable-c368362c36d3d4cedbc9a1c9caa95960912cc429.zip
mt76: fix iv and CCMP header insertion
The iv from RXD is only for TKIP_RSC/CCMP_PN/GCMP_PN, and it needs a check for CCMP header insertion. Move mt76_cipher_type to mt76.h to reduce duplicated code. Signed-off-by: Xing Song <xing.song@mediatek.com> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7921/mcu.h')
-rw-r--r--drivers/net/wireless/mediatek/mt76/mt7921/mcu.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
index 89fed2f71161..d76cf8f8dfdf 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
@@ -198,18 +198,17 @@ struct sta_rec_sec {
struct sec_key key[2];
} __packed;
-enum mt7921_cipher_type {
- MT_CIPHER_NONE,
- MT_CIPHER_WEP40,
- MT_CIPHER_WEP104,
- MT_CIPHER_WEP128,
- MT_CIPHER_TKIP,
- MT_CIPHER_AES_CCMP,
- MT_CIPHER_CCMP_256,
- MT_CIPHER_GCMP,
- MT_CIPHER_GCMP_256,
- MT_CIPHER_WAPI,
- MT_CIPHER_BIP_CMAC_128,
+enum mcu_cipher_type {
+ MCU_CIPHER_WEP40 = 1,
+ MCU_CIPHER_WEP104,
+ MCU_CIPHER_WEP128,
+ MCU_CIPHER_TKIP,
+ MCU_CIPHER_AES_CCMP,
+ MCU_CIPHER_CCMP_256,
+ MCU_CIPHER_GCMP,
+ MCU_CIPHER_GCMP_256,
+ MCU_CIPHER_WAPI,
+ MCU_CIPHER_BIP_CMAC_128,
};
enum {