Skip to content

L
linux
Commit d80e52c7 authored by Felix Fietkau's avatar Felix Fietkau
Browse files
Options

mt76: remove qid argument to drv->tx_complete_skb 

It is not needed
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent fe5b5ab5
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 28 deletions
drivers/net/wireless/mediatek/mt76/dma.c
View file @ d80e52c7
...@@ -359,7 +359,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, ...@@ -359,7 +359,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,
e.skb = tx_info.skb; e.skb = tx_info.skb;
e.txwi = t; e.txwi = t;
dev->drv->tx_complete_skb(dev, qid, &e); dev->drv->tx_complete_skb(dev, &e);
mt76_put_txwi(dev, t); mt76_put_txwi(dev, t);
return ret; return ret;
} }
......
drivers/net/wireless/mediatek/mt76/mt76.h
View file @ d80e52c7
...@@ -326,7 +326,7 @@ struct mt76_driver_ops { ...@@ -326,7 +326,7 @@ struct mt76_driver_ops {
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); 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); struct mt76_queue_entry *e);
bool (*tx_status_data)(struct mt76_dev *dev, u8 *update); bool (*tx_status_data)(struct mt76_dev *dev, u8 *update);
......
drivers/net/wireless/mediatek/mt76/mt7603/mac.c
View file @ d80e52c7
...@@ -1271,8 +1271,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data) ...@@ -1271,8 +1271,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)
rcu_read_unlock(); rcu_read_unlock();
} }
void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
struct mt76_queue_entry *e)
{ {
struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76); struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);
struct sk_buff *skb = e->skb; struct sk_buff *skb = e->skb;
...@@ -1282,9 +1281,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, ...@@ -1282,9 +1281,7 @@ void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,
return; return;
} }
if (qid < 4)
dev->tx_hang_check = 0; dev->tx_hang_check = 0;
mt76_tx_complete_skb(mdev, skb); mt76_tx_complete_skb(mdev, skb);
} }
......
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
View file @ d80e52c7
...@@ -241,8 +241,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, ...@@ -241,8 +241,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7603_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
struct mt76_queue_entry *e);
void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, void mt7603_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
struct sk_buff *skb); struct sk_buff *skb);
......
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
View file @ d80e52c7
...@@ -618,8 +618,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, ...@@ -618,8 +618,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt7615_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
struct mt76_queue_entry *e);
void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
struct sk_buff *skb); struct sk_buff *skb);
...@@ -674,7 +673,6 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, ...@@ -674,7 +673,6 @@ int mt7663_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
bool mt7663_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update); bool mt7663_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update);
void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev, void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,
enum mt76_txq_id qid,
struct mt76_queue_entry *e); struct mt76_queue_entry *e);
void mt7663_usb_sdio_wtbl_work(struct work_struct *work); void mt7663_usb_sdio_wtbl_work(struct work_struct *work);
int mt7663_usb_sdio_register_device(struct mt7615_dev *dev); int mt7663_usb_sdio_register_device(struct mt7615_dev *dev);
......
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
View file @ d80e52c7
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include "../dma.h" #include "../dma.h"
#include "mac.h" #include "mac.h"
void mt7615_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
struct mt76_queue_entry *e)
{ {
if (!e->txwi) { if (!e->txwi) {
dev_kfree_skb_any(e->skb); dev_kfree_skb_any(e->skb);
......
drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c
View file @ d80e52c7
...@@ -226,7 +226,6 @@ bool mt7663_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update) ...@@ -226,7 +226,6 @@ bool mt7663_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)
EXPORT_SYMBOL_GPL(mt7663_usb_sdio_tx_status_data); EXPORT_SYMBOL_GPL(mt7663_usb_sdio_tx_status_data);
void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev, void mt7663_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,
enum mt76_txq_id qid,
struct mt76_queue_entry *e) struct mt76_queue_entry *e)
{ {
unsigned int headroom = MT_USB_TXD_SIZE; unsigned int headroom = MT_USB_TXD_SIZE;
......
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
View file @ d80e52c7
...@@ -900,8 +900,7 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq) ...@@ -900,8 +900,7 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq)
} }
} }
void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
struct mt76_queue_entry *e)
{ {
struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
struct mt76x02_txwi *txwi; struct mt76x02_txwi *txwi;
......
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h
View file @ d80e52c7
...@@ -194,8 +194,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, ...@@ -194,8 +194,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
struct sk_buff *skb, struct mt76_wcid *wcid, struct sk_buff *skb, struct mt76_wcid *wcid,
struct ieee80211_sta *sta, int len); struct ieee80211_sta *sta, int len);
void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq); void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq);
void mt76x02_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
struct mt76_queue_entry *e);
void mt76x02_update_channel(struct mt76_dev *mdev); void mt76x02_update_channel(struct mt76_dev *mdev);
void mt76x02_mac_work(struct work_struct *work); void mt76x02_mac_work(struct work_struct *work);
......
drivers/net/wireless/mediatek/mt76/mt76x02_usb.h
View file @ d80e52c7
...@@ -19,8 +19,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data, ...@@ -19,8 +19,7 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *mdev, void *data,
enum mt76_txq_id qid, struct mt76_wcid *wcid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
struct mt76_queue_entry *e);
void mt76x02u_init_beacon_config(struct mt76x02_dev *dev); void mt76x02u_init_beacon_config(struct mt76x02_dev *dev);
void mt76x02u_exit_beacon_config(struct mt76x02_dev *dev); void mt76x02u_exit_beacon_config(struct mt76x02_dev *dev);
#endif /* __MT76x02_USB_H */ #endif /* __MT76x02_USB_H */
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
View file @ d80e52c7
...@@ -15,8 +15,7 @@ static void mt76x02u_remove_dma_hdr(struct sk_buff *skb) ...@@ -15,8 +15,7 @@ static void mt76x02u_remove_dma_hdr(struct sk_buff *skb)
mt76x02_remove_hdr_pad(skb, 2); mt76x02_remove_hdr_pad(skb, 2);
} }
void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
struct mt76_queue_entry *e)
{ {
mt76x02u_remove_dma_hdr(e->skb); mt76x02u_remove_dma_hdr(e->skb);
mt76_tx_complete_skb(mdev, e->skb); mt76_tx_complete_skb(mdev, e->skb);
......
drivers/net/wireless/mediatek/mt76/mt7915/mac.c
View file @ d80e52c7
...@@ -943,8 +943,7 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb) ...@@ -943,8 +943,7 @@ void mt7915_mac_tx_free(struct mt7915_dev *dev, struct sk_buff *skb)
tasklet_schedule(&dev->mt76.tx_tasklet); tasklet_schedule(&dev->mt76.tx_tasklet);
} }
void mt7915_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)
struct mt76_queue_entry *e)
{ {
struct mt7915_dev *dev; struct mt7915_dev *dev;
......
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
View file @ d80e52c7
...@@ -454,8 +454,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, ...@@ -454,8 +454,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
enum mt76_txq_id qid, struct mt76_wcid *wcid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); struct mt76_tx_info *tx_info);
void mt7915_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
struct mt76_queue_entry *e);
void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
struct sk_buff *skb); struct sk_buff *skb);
void mt7915_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps); void mt7915_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);
......
drivers/net/wireless/mediatek/mt76/tx.c
View file @ d80e52c7
...@@ -704,7 +704,7 @@ void mt76_queue_tx_complete(struct mt76_dev *dev, struct mt76_queue *q, ...@@ -704,7 +704,7 @@ void mt76_queue_tx_complete(struct mt76_dev *dev, struct mt76_queue *q,
bool ext_phy = e->qid >= 4; bool ext_phy = e->qid >= 4;
if (e->skb) if (e->skb)
dev->drv->tx_complete_skb(dev, qid, e); dev->drv->tx_complete_skb(dev, e);
spin_lock_bh(&q->lock); spin_lock_bh(&q->lock);
q->tail = (q->tail + 1) % q->ndesc; q->tail = (q->tail + 1) % q->ndesc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7