diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-07-21 17:06:56 +0200 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2021-08-06 10:56:53 +0300 |
| commit | abf3d98dee7c4038152ce88833ddc2189f68cbd4 (patch) | |
| tree | 5d0913a92cb46714bdca5cb1ebbad72d558664a0 /drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | |
| parent | iwlwifi: add new so-jf devices (diff) | |
| download | wireguard-linux-abf3d98dee7c4038152ce88833ddc2189f68cbd4.tar.xz wireguard-linux-abf3d98dee7c4038152ce88833ddc2189f68cbd4.zip | |
mt76: fix enum type mismatch
There is no 'NONE' version of 'enum mcu_cipher_type', and returning
'MT_CIPHER_NONE' causes a warning:
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c: In function 'mt7921_mcu_get_cipher':
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:114:24: error: implicit conversion from 'enum mt76_cipher_type' to 'enum mcu_cipher_type' [-Werror=enum-conversion]
114 | return MT_CIPHER_NONE;
| ^~~~~~~~~~~~~~
Add the missing MCU_CIPHER_NONE defintion that fits in here with
the same value.
Fixes: c368362c36d3 ("mt76: fix iv and CCMP header insertion")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210721150745.1914829-1-arnd@kernel.org
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7915/mcu.h')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h index edd3ba3a0c2d..e68a562cc5b4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h @@ -1073,7 +1073,8 @@ enum { }; enum mcu_cipher_type { - MCU_CIPHER_WEP40 = 1, + MCU_CIPHER_NONE = 0, + MCU_CIPHER_WEP40, MCU_CIPHER_WEP104, MCU_CIPHER_WEP128, MCU_CIPHER_TKIP, |