mt75: fix enum type mismatch
PATCH 1/1 mt75: fix enum type mismatch
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 <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -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;
Signature · 7 lines
2.26.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel