From: Nathan Chancellor <nathan@kernel.org> To: sean.wang@mediatek.com Cc: nbd@nbd.name, lorenzo.bianconi@redhat.com, Soul.Huang@mediatek.com, YN.Chen@mediatek.com, Leon.Yen@mediatek.com, Eric-SY.Chang@mediatek.com, Deren.Wu@mediatek.com, km.lin@mediatek.com, robin.chiu@mediatek.com, ch.yeh@mediatek.com, posh.sun@mediatek.com, Eric.Liang@mediatek.com, Stella.Chang@mediatek.com, jemele@google.com, yenlinlai@google.com, linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH 2/2] mt76: fix build error implicit enumeration conversion Date: Mon, 26 Jul 2021 17:42:18 -0700 [thread overview] Message-ID: <YP9Warx1zcUofVhJ@Ryzen-9-3900X.localdomain> (raw) In-Reply-To: <62c5ed786f81ddea6d3587647520e9e4254c8612.1624174954.git.objelf@gmail.com> On Sun, Jun 20, 2021 at 03:48:07PM +0800, sean.wang@mediatek.com wrote: > From: Sean Wang <sean.wang@mediatek.com> > > 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> Reviewed-by: Nathan Chancellor <nathan@kernel.org> It would be nice if this could be added to 5.14-rc at some point in the cycle as this shows up in clang builds for allmodconfig for various architectures and I still do not see it in -next. > --- > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 4 ++-- > drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 3 ++- > drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 ++-- > drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 3 ++- > 4 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > index 863aa18b3024..c2e537a9c1dc 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > @@ -111,7 +111,7 @@ mt7915_mcu_get_cipher(int cipher) > case WLAN_CIPHER_SUITE_SMS4: > return MCU_CIPHER_WAPI; > default: > - return MT_CIPHER_NONE; > + return MCU_CIPHER_NONE; > } > } > > @@ -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/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h > index edd3ba3a0c2d..5b9b425bd836 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, > + MCU_CIPHER_WEP40, > MCU_CIPHER_WEP104, > MCU_CIPHER_WEP128, > MCU_CIPHER_TKIP, > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c > index c2c4dc196802..81633be09e90 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c > @@ -111,7 +111,7 @@ mt7921_mcu_get_cipher(int cipher) > case WLAN_CIPHER_SUITE_SMS4: > return MCU_CIPHER_WAPI; > default: > - return MT_CIPHER_NONE; > + return MCU_CIPHER_NONE; > } > } > > @@ -619,7 +619,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]; > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h > index d76cf8f8dfdf..3334afd8aea9 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h > @@ -199,7 +199,8 @@ struct sta_rec_sec { > } __packed; > > enum mcu_cipher_type { > - MCU_CIPHER_WEP40 = 1, > + MCU_CIPHER_NONE, > + MCU_CIPHER_WEP40, > MCU_CIPHER_WEP104, > MCU_CIPHER_WEP128, > MCU_CIPHER_TKIP, > -- > 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Nathan Chancellor <nathan@kernel.org> To: sean.wang@mediatek.com Cc: nbd@nbd.name, lorenzo.bianconi@redhat.com, Soul.Huang@mediatek.com, YN.Chen@mediatek.com, Leon.Yen@mediatek.com, Eric-SY.Chang@mediatek.com, Deren.Wu@mediatek.com, km.lin@mediatek.com, robin.chiu@mediatek.com, ch.yeh@mediatek.com, posh.sun@mediatek.com, Eric.Liang@mediatek.com, Stella.Chang@mediatek.com, jemele@google.com, yenlinlai@google.com, linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH 2/2] mt76: fix build error implicit enumeration conversion Date: Mon, 26 Jul 2021 17:42:18 -0700 [thread overview] Message-ID: <YP9Warx1zcUofVhJ@Ryzen-9-3900X.localdomain> (raw) In-Reply-To: <62c5ed786f81ddea6d3587647520e9e4254c8612.1624174954.git.objelf@gmail.com> On Sun, Jun 20, 2021 at 03:48:07PM +0800, sean.wang@mediatek.com wrote: > From: Sean Wang <sean.wang@mediatek.com> > > 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> Reviewed-by: Nathan Chancellor <nathan@kernel.org> It would be nice if this could be added to 5.14-rc at some point in the cycle as this shows up in clang builds for allmodconfig for various architectures and I still do not see it in -next. > --- > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 4 ++-- > drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 3 ++- > drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 ++-- > drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 3 ++- > 4 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > index 863aa18b3024..c2e537a9c1dc 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > @@ -111,7 +111,7 @@ mt7915_mcu_get_cipher(int cipher) > case WLAN_CIPHER_SUITE_SMS4: > return MCU_CIPHER_WAPI; > default: > - return MT_CIPHER_NONE; > + return MCU_CIPHER_NONE; > } > } > > @@ -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/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h > index edd3ba3a0c2d..5b9b425bd836 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, > + MCU_CIPHER_WEP40, > MCU_CIPHER_WEP104, > MCU_CIPHER_WEP128, > MCU_CIPHER_TKIP, > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c > index c2c4dc196802..81633be09e90 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c > @@ -111,7 +111,7 @@ mt7921_mcu_get_cipher(int cipher) > case WLAN_CIPHER_SUITE_SMS4: > return MCU_CIPHER_WAPI; > default: > - return MT_CIPHER_NONE; > + return MCU_CIPHER_NONE; > } > } > > @@ -619,7 +619,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]; > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h > index d76cf8f8dfdf..3334afd8aea9 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h > @@ -199,7 +199,8 @@ struct sta_rec_sec { > } __packed; > > enum mcu_cipher_type { > - MCU_CIPHER_WEP40 = 1, > + MCU_CIPHER_NONE, > + MCU_CIPHER_WEP40, > MCU_CIPHER_WEP104, > MCU_CIPHER_WEP128, > MCU_CIPHER_TKIP, > -- > 2.25.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-07-27 0:42 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-20 7:48 [PATCH 1/2] mt76: mt7921: enable aspm by default sean.wang 2021-06-20 7:48 ` sean.wang 2021-06-20 7:48 ` [PATCH 2/2] mt76: fix build error implicit enumeration conversion sean.wang 2021-06-20 7:48 ` sean.wang 2021-07-27 0:42 ` Nathan Chancellor [this message] 2021-07-27 0:42 ` Nathan Chancellor 2021-06-20 9:44 ` [PATCH 1/2] mt76: mt7921: enable aspm by default Lorenzo Bianconi 2021-06-20 9:44 ` Lorenzo Bianconi 2021-06-22 9:15 ` Kalle Valo 2021-06-22 9:15 ` Kalle Valo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=YP9Warx1zcUofVhJ@Ryzen-9-3900X.localdomain \ --to=nathan@kernel.org \ --cc=Deren.Wu@mediatek.com \ --cc=Eric-SY.Chang@mediatek.com \ --cc=Eric.Liang@mediatek.com \ --cc=Leon.Yen@mediatek.com \ --cc=Soul.Huang@mediatek.com \ --cc=Stella.Chang@mediatek.com \ --cc=YN.Chen@mediatek.com \ --cc=ch.yeh@mediatek.com \ --cc=jemele@google.com \ --cc=km.lin@mediatek.com \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ --cc=lorenzo.bianconi@redhat.com \ --cc=nbd@nbd.name \ --cc=posh.sun@mediatek.com \ --cc=robin.chiu@mediatek.com \ --cc=sean.wang@mediatek.com \ --cc=yenlinlai@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.