lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 463/917] mt76: fix build error implicit enumeration conversion
    Date
    From: Sean Wang <sean.wang@mediatek.com>

    [ Upstream commit adedbc643f02f5a3193b8dcc5cfca97b4c988667 ]

    drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:114:10: error: implicit
    conversion from enumeration type 'enum mt76_cipher_type' to different
    enumeration type 'enum mcu_cipher_type' [-Werror,-Wenum-conversion]
    return MT_CIPHER_NONE;
    ~~~~~~ ^~~~~~~~~~~~~~

    drivers/net/wireless/mediatek/mt76/mt7921/mcu.c:114:10: error: implicit
    conversion from enumeration type 'enum mt76_cipher_type' to different
    enumeration type 'enum mcu_cipher_type' [-Werror,-Wenum-conversion]
    return MT_CIPHER_NONE;
    ~~~~~~ ^~~~~~~~~~~~~~

    Fixes: c368362c36d3 ("mt76: fix iv and CCMP header insertion")
    Signed-off-by: Sean Wang <sean.wang@mediatek.com>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +-
    drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
    index caf2033c5c17e..c08c7398f9b85 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
    @@ -1201,7 +1201,7 @@ mt7915_mcu_sta_key_tlv(struct mt7915_sta *msta, struct sk_buff *skb,
    u8 cipher;

    cipher = mt7915_mcu_get_cipher(key->cipher);
    - if (cipher == MT_CIPHER_NONE)
    + if (cipher == MCU_CIPHER_NONE)
    return -EOPNOTSUPP;

    sec_key = &sec->key[0];
    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
    index 68840e55ede7a..8329b705c2ca2 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
    @@ -620,7 +620,7 @@ mt7921_mcu_sta_key_tlv(struct mt7921_sta *msta, struct sk_buff *skb,
    u8 cipher;

    cipher = mt7921_mcu_get_cipher(key->cipher);
    - if (cipher == MT_CIPHER_NONE)
    + if (cipher == MCU_CIPHER_NONE)
    return -EOPNOTSUPP;

    sec_key = &sec->key[0];
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:33    [W:2.928 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site