* [PATCH] [wireless-next] mt75: fix enum type mismatch
@ 2020-05-27 13:36 Arnd Bergmann
0 siblings, 0 replies; only message in thread
From: Arnd Bergmann @ 2020-05-27 13:36 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi, Kalle Valo
Cc: Arnd Bergmann, Ryder Lee, Shayne Chen, Chih-Min Chen,
Shihwei Lin, Yiwei Chung, YF Luo, David S. Miller,
Jakub Kicinski, Matthias Brugger, YueHaibing, linux-wireless,
netdev, linux-arm-kernel, linux-mediatek, linux-kernel
The __mt7915_mcu_msg_send() calls a generic function that expects a mt76_txq_id
rather than mt7915_txq_id, and it also uses the values according to that
type, which are different from the similarly named MT7915_TXQ_ constants:
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:232:9: error: implicit conversion from enumeration type 'enum mt76_txq_id' to different enumeration type 'enum mt7915_txq_id' [-Werror,-Wenum-conversion]
txq = MT_TXQ_FWDL;
~ ^~~~~~~~~~~
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:287:36: error: implicit conversion from enumeration type 'enum mt7915_txq_id' to different enumeration type 'enum mt76_txq_id' [-Werror,-Wenum-conversion]
return mt76_tx_queue_skb_raw(dev, txq, skb, 0);
~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
drivers/net/wireless/mediatek/mt76/mt7915/../mt76.h:668:97: note: expanded from macro 'mt76_tx_queue_skb_raw'
Use the mt76 types consistently.
Fixes: e57b7901469f ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 99eeea42478f..001b3078c48e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -220,7 +220,7 @@ static int __mt7915_mcu_msg_send(struct mt7915_dev *dev, struct sk_buff *skb,
{
struct mt7915_mcu_txd *mcu_txd;
u8 seq, pkt_fmt, qidx;
- enum mt7915_txq_id txq;
+ enum mt76_txq_id txq;
__le32 *txd;
u32 val;
--
2.26.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-27 13:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 13:36 [PATCH] [wireless-next] mt75: fix enum type mismatch Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).