rt2x00: Move duplicate code into rt2x00pci_txdone()

rt2400pci, rt2500pci and rt61 require different
txdone handling, but the code that pushes the frame
upstream and cleans up the entry is identical to
all of them.
This will create the function rt2x00pci_txdone()
to remove the duplicate code.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 38 insertions, 58 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index d48b6ca9845a..bdf3edc6524f 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1167,26 +1167,8 @@ static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev, const int queue)
                 tx_status = rt2x00_get_field32(word, TXD_W0_RESULT);
                 retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);
 
-                rt2x00lib_txdone(entry, tx_status, retry);
-
-                /*
-                 * Make this entry available for reuse.
-                 */
-                entry->flags = 0;
-                rt2x00_set_field32(&word, TXD_W0_VALID, 0);
-                rt2x00_desc_write(txd, 0, word);
-                rt2x00_ring_index_done_inc(ring);
+                rt2x00pci_txdone(rt2x00dev, entry, tx_status, retry);
         }
-
-        /*
-         * If the data ring was full before the txdone handler
-         * we must make sure the packet queue in the mac80211 stack
-         * is reenabled when the txdone handler has finished.
-         */
-        entry = ring->entry;
-        if (!rt2x00_ring_full(ring))
-                ieee80211_wake_queue(rt2x00dev->hw,
-                                     entry->tx_status.control.queue);
 }
 
 static irqreturn_t rt2400pci_interrupt(int irq, void *dev_instance)
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index e6a0c37d9195..b6bb9644e25f 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1298,26 +1298,8 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev, const int queue)
                 tx_status = rt2x00_get_field32(word, TXD_W0_RESULT);
                 retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);
 
-                rt2x00lib_txdone(entry, tx_status, retry);
-
-                /*
-                 * Make this entry available for reuse.
-                 */
-                entry->flags = 0;
-                rt2x00_set_field32(&word, TXD_W0_VALID, 0);
-                rt2x00_desc_write(txd, 0, word);
-                rt2x00_ring_index_done_inc(ring);
+                rt2x00pci_txdone(rt2x00dev, entry, tx_status, retry);
         }
-
-        /*
-         * If the data ring was full before the txdone handler
-         * we must make sure the packet queue in the mac80211 stack
-         * is reenabled when the txdone handler has finished.
-         */
-        entry = ring->entry;
-        if (!rt2x00_ring_full(ring))
-                ieee80211_wake_queue(rt2x00dev->hw,
-                                     entry->tx_status.control.queue);
 }
 
 static irqreturn_t rt2500pci_interrupt(int irq, void *dev_instance)
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index fa85771cbf47..55d0614588b2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -116,7 +116,7 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
 EXPORT_SYMBOL_GPL(rt2x00pci_write_tx_data);
 
 /*
- * RX data handlers.
+ * TX/RX data handlers.
  */
 void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 {
@@ -177,6 +177,37 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_rxdone);
 
+void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct data_entry *entry,
+                      const int tx_status, const int retry)
+{
+        u32 word;
+
+        rt2x00lib_txdone(entry, tx_status, retry);
+
+        /*
+         * Make this entry available for reuse.
+         */
+        entry->flags = 0;
+
+        rt2x00_desc_read(entry->priv, 0, &word);
+        rt2x00_set_field32(&word, TXD_ENTRY_OWNER_NIC, 0);
+        rt2x00_set_field32(&word, TXD_ENTRY_VALID, 0);
+        rt2x00_desc_write(entry->priv, 0, word);
+
+        rt2x00_ring_index_done_inc(entry->ring);
+
+        /*
+         * If the data ring was full before the txdone handler
+         * we must make sure the packet queue in the mac80211 stack
+         * is reenabled when the txdone handler has finished.
+         */
+        if (!rt2x00_ring_full(entry->ring))
+                ieee80211_wake_queue(rt2x00dev->hw,
+                                     entry->tx_status.control.queue);
+
+}
+EXPORT_SYMBOL_GPL(rt2x00pci_txdone);
+
 /*
  * Device initialization handlers.
  */
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index 03572054509a..2d1eb8144da4 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -101,9 +101,11 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
                             struct ieee80211_tx_control *control);
 
 /*
- * RX data handlers.
+ * RX/TX data handlers.
  */
 void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev);
+void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct data_entry *entry,
+                      const int tx_status, const int retry);
 
 /*
  * Device initialization handlers.
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 606cf1299fff..40e516b70fed 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1779,24 +1779,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
                 tx_status = rt2x00_get_field32(reg, STA_CSR4_TX_RESULT);
                 retry = rt2x00_get_field32(reg, STA_CSR4_RETRY_COUNT);
 
-                rt2x00lib_txdone(entry, tx_status, retry);
-
-                /*
-                 * Make this entry available for reuse.
-                 */
-                entry->flags = 0;
-                rt2x00_set_field32(&word, TXD_W0_VALID, 0);
-                rt2x00_desc_write(txd, 0, word);
-                rt2x00_ring_index_done_inc(entry->ring);
-
-                /*
-                 * If the data ring was full before the txdone handler
-                 * we must make sure the packet queue in the mac80211 stack
-                 * is reenabled when the txdone handler has finished.
-                 */
-                if (!rt2x00_ring_full(ring))
-                        ieee80211_wake_queue(rt2x00dev->hw,
-                                             entry->tx_status.control.queue);
+                rt2x00pci_txdone(rt2x00dev, entry, tx_status, retry);
         }
 }