Skip to contentSkip to conversation

mt76: introduce mt76_free_device routine

PATCH Applied Lorenzo Bianconi 2 participants 2 messages Mar 27, 2019 – Apr 12, 2019 1 message not in the archive

Subsystems (2)
Arm MediaTek MediaTek MT76 wireless LAN driver
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Lorenzo Bianconi

author maintainer
#1 lore raw

PATCH 1/1 mt76: introduce mt76_free_device routine

Move mt76_tx_free in mt76_free_device routine in order to unmap all txwi descriptors at module unload

Signed-off-by Lorenzo Bianconi <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mac80211.c    | 8 +++++++-
 drivers/net/wireless/mediatek/mt76/mt76.h        | 1 +
 drivers/net/wireless/mediatek/mt76/mt7603/init.c | 2 +-
 drivers/net/wireless/mediatek/mt76/mt76x0/pci.c  | 2 +-
 drivers/net/wireless/mediatek/mt76/mt76x2/pci.c  | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +7 -1
index 15825e9a458f..f0d418b751ad 100644
@@ -369,10 +369,16 @@ void mt76_unregister_device(struct mt76_dev *dev)
 
 	mt76_tx_status_check(dev, NULL, true);
 	ieee80211_unregister_hw(hw);
-	mt76_tx_free(dev);
 }
 EXPORT_SYMBOL_GPL(mt76_unregister_device);
 
+void mt76_free_device(struct mt76_dev *dev)
+{
+	mt76_tx_free(dev);
+	ieee80211_free_hw(dev->hw);
+}
+EXPORT_SYMBOL_GPL(mt76_free_device);
+
 void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)
 {
 	if (!test_bit(MT76_STATE_RUNNING, &dev->state)) {
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
index b432da3f55c7..f0d34901c825 100644
@@ -605,6 +605,7 @@ struct mt76_dev *mt76_alloc_device(struct device *pdev, unsigned int size,
 int mt76_register_device(struct mt76_dev *dev, bool vht,
 			 struct ieee80211_rate *rates, int n_rates);
 void mt76_unregister_device(struct mt76_dev *dev);
+void mt76_free_device(struct mt76_dev *dev);
 
 struct dentry *mt76_register_debugfs(struct mt76_dev *dev);
 void mt76_seq_puts_array(struct seq_file *file, const char *str,
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -1
index e17b6b89dfe2..a84b239887ca 100644
@@ -574,5 +574,5 @@ void mt7603_unregister_device(struct mt7603_dev *dev)
 	mt76_unregister_device(&dev->mt76);
 	mt7603_mcu_exit(dev);
 	mt7603_dma_cleanup(dev);
-	ieee80211_free_hw(mt76_hw(dev));
+	mt76_free_device(&dev->mt76);
 }
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +1 -1
index a7ff7e32b9b3..156d3d064ba0 100644
@@ -234,7 +234,7 @@ mt76x0e_remove(struct pci_dev *pdev)
 
 	mt76_unregister_device(mdev);
 	mt76x0e_cleanup(dev);
-	ieee80211_free_hw(mdev->hw);
+	mt76_free_device(mdev);
 }
 
 static const struct pci_device_id mt76x0e_device_table[] = {
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +1 -1
index 4747f782417a..e84d5c5911ea 100644
@@ -107,7 +107,7 @@ mt76pci_remove(struct pci_dev *pdev)
 
 	mt76_unregister_device(mdev);
 	mt76x2_cleanup(dev);
-	ieee80211_free_hw(mdev->hw);
+	mt76_free_device(mdev);
 }
 
 MODULE_DEVICE_TABLE(pci, mt76pci_device_table);
Signature · 1 line
2.20.1