From f0c191a9f6cdba7b92e79eae291ddfbfc636faee Mon Sep 17 00:00:00 2001 From: Shayne Chen Date: Mon, 28 Nov 2022 11:28:26 +0800 Subject: [PATCH] wifi: mt76: mt7996: add missing argument in mt7996_queue_rx_skb() An argument has been added in .rx_skb driver ops callback after introducing WED RX support. Align it to fix the following compile error: >> drivers/net/wireless/mediatek/mt76/mt7996/mmio.c:328:13: error: incompatible function pointer types initializing 'void (*)(struct mt76_dev *, enum mt76_rxq_id, struct sk_buff *, u32 *)' (aka 'void (*)(struct mt76_dev *, enum mt76_rxq_id, struct sk_buff *, unsigned int *)') with an expression of type 'void (struct mt76_dev *, enum mt76_rxq_id, struct sk_buff *)' [-Werror,-Wincompatible-function-pointer-types] .rx_skb = mt7996_queue_rx_skb, ^~~~~~~~~~~~~~~~~~~ 1 error generated. Reported-by: kernel test robot Signed-off-by: Shayne Chen Signed-off-by: Felix Fietkau --- mt7996/mac.c | 2 +- mt7996/mt7996.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mt7996/mac.c b/mt7996/mac.c index 7dec7d30..1c35f0f1 100644 --- a/mt7996/mac.c +++ b/mt7996/mac.c @@ -1514,7 +1514,7 @@ bool mt7996_rx_check(struct mt76_dev *mdev, void *data, int len) } void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, - struct sk_buff *skb) + struct sk_buff *skb, u32 *info) { struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76); __le32 *rxd = (__le32 *)skb->data; diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h index 371195e4..167f615f 100644 --- a/mt7996/mt7996.h +++ b/mt7996/mt7996.h @@ -489,7 +489,7 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, void mt7996_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); void mt7996_tx_token_put(struct mt7996_dev *dev); void mt7996_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, - struct sk_buff *skb); + struct sk_buff *skb, u32 *info); bool mt7996_rx_check(struct mt76_dev *mdev, void *data, int len); void mt7996_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps); void mt7996_stats_work(struct work_struct *work);