Commit c3137942 authored by Sujuan Chen's avatar Sujuan Chen Committed by Felix Fietkau
Browse files

wifi: mt76: add info parameter to rx_skb signature 



This is a preliminary patch to introduce WED RX support for mt7915.

Tested-by: default avatarDaniel Golle <daniel@makrotopia.org>
Co-developed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 52546e27

drivers/net/wireless/mediatek/mt76/dma.c

+4 −4
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) 


static void

mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data,

		  int len, bool more)

		  int len, bool more, u32 info)

{

	struct sk_buff *skb = q->rx_head;

	struct skb_shared_info *shinfo = skb_shinfo(skb);
@@ -770,7 +770,7 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, 


	q->rx_head = NULL;

	if (nr_frags < ARRAY_SIZE(shinfo->frags))

		dev->drv->rx_skb(dev, q - dev->q_rx, skb);

		dev->drv->rx_skb(dev, q - dev->q_rx, skb, &info);

	else

		dev_kfree_skb(skb);

}
@@ -822,7 +822,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		}



		if (q->rx_head) {

			mt76_add_fragment(dev, q, data, len, more);

			mt76_add_fragment(dev, q, data, len, more, info);

			continue;

		}
@@ -846,7 +846,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
			continue;

		}



		dev->drv->rx_skb(dev, q - dev->q_rx, skb);

		dev->drv->rx_skb(dev, q - dev->q_rx, skb, &info);

		continue;



free_frag:

drivers/net/wireless/mediatek/mt76/mt76.h

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ struct mt76_driver_ops { 
	bool (*rx_check)(struct mt76_dev *dev, void *data, int len);



	void (*rx_skb)(struct mt76_dev *dev, enum mt76_rxq_id q,

		       struct sk_buff *skb);

		       struct sk_buff *skb, u32 *info);



	void (*rx_poll_complete)(struct mt76_dev *dev, enum mt76_rxq_id q);

drivers/net/wireless/mediatek/mt76/mt7603/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) 
}



void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

			 struct sk_buff *skb)

			 struct sk_buff *skb, u32 *info)

{

	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);

	__le32 *rxd = (__le32 *)skb->data;

drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);



void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

			 struct sk_buff *skb);

			 struct sk_buff *skb, u32 *info);

void mt7603_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);

void mt7603_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);

int mt7603_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ bool mt7615_rx_check(struct mt76_dev *mdev, void *data, int len) 
EXPORT_SYMBOL_GPL(mt7615_rx_check);



void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

			 struct sk_buff *skb)

			 struct sk_buff *skb, u32 *info)

{

	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);

	__le32 *rxd = (__le32 *)skb->data;