mt76: remove qid argument to drv->tx_complete_skb (d80e52c7) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,7 @@ free:

		e.skb = tx_info.skb;
		e.txwi = t;
		dev->drv->tx_complete_skb(dev, qid, &e);
		dev->drv->tx_complete_skb(dev, &e);
		mt76_put_txwi(dev, t);
		return ret;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -326,7 +326,7 @@ struct mt76_driver_ops {
		struct ieee80211_sta *sta,
		struct mt76_tx_info *tx_info);

		void (tx_complete_skb)(struct mt76_dev dev, enum mt76_txq_id qid,
		void (tx_complete_skb)(struct mt76_dev dev,
		struct mt76_queue_entry *e);

		bool (tx_status_data)(struct mt76_dev dev, u8 *update);

+2 −5

Original line number	Diff line number	Diff line
		@@ -1271,8 +1271,7 @@ out:
		rcu_read_unlock();
		}

		void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
		struct mt76_queue_entry *e)
		void mt7603_tx_complete_skb(struct mt76_dev mdev, struct mt76_queue_entry e)
		{
		struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);
		struct sk_buff *skb = e->skb;
		@@ -1282,9 +1281,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
		return;
		}

		if (qid < 4)
		dev->tx_hang_check = 0;

		mt76_tx_complete_skb(mdev, skb);
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -241,8 +241,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev mdev, void txwi_ptr,
		struct ieee80211_sta *sta,
		struct mt76_tx_info *tx_info);

		void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
		struct mt76_queue_entry *e);
		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);

+1 −3

Original line number	Diff line number	Diff line
		@@ -618,8 +618,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev mdev, void txwi_ptr,
		struct ieee80211_sta *sta,
		struct mt76_tx_info *tx_info);

		void mt7615_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
		struct mt76_queue_entry *e);
		void mt7615_tx_complete_skb(struct mt76_dev mdev, struct mt76_queue_entry e);

		void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
		struct sk_buff *skb);
		@@ -674,7 +673,6 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev mdev, void txwi_ptr,
		struct mt76_tx_info *tx_info);
		bool mt7663_usb_sdio_tx_status_data(struct mt76_dev mdev, u8 update);
		void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,
		enum mt76_txq_id qid,
		struct mt76_queue_entry *e);
		void mt7663_usb_sdio_wtbl_work(struct work_struct *work);
		int mt7663_usb_sdio_register_device(struct mt7615_dev *dev);