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 <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 15825e9a458fc94ccd461536cb60f0f24b852f3b..f0d418b751adf0ae4b85dff84736668943512eb7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -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)) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index b432da3f55c78a50b5da3bf3e3eb434f6d075d79..f0d34901c82512763d85402101ae5efed1c19ffd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -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,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
index 67b05b6512388fdcf1d1a59c3c39485039858ada..418c2b9979e53fb372922761e6bc627eb6beb73d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
@@ -576,5 +576,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);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index a7ff7e32b9b33379462626c61eaaa729f7094e43..156d3d064ba0fce50e7d53d83f2db760a7bb463a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -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[] = {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
index 4747f782417a5a76d64f2dd0902a1367bc9acba2..e84d5c5911ea82147abc4a5ec7b50c431e0b31da 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
@@ -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);