rt2x00: Cleanup TX/RX entry handling

Merge the callback functions init_txentry() and
init_rxentry(). This makes life in rt2x00lib a
lot simpler and we can cleanup several functions.

rt2x00pci contained "fake" FIELD definitions for
descriptor words. This is not flexible since it
assumes the driver will always have the same field
to indicate if a driver is available or not.
This should be dependent on the driver, and we
should add a callback function for this.

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

1 files changed, 4 insertions, 9 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 62449da577e5..e33bd0f150c5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -36,20 +36,17 @@
  */
 int rt2x00pci_write_tx_data(struct queue_entry *entry)
 {
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct queue_entry_priv_pci *entry_priv = entry->priv_data;
         struct skb_frame_desc *skbdesc;
-        u32 word;
-
-        rt2x00_desc_read(entry_priv->desc, 0, &word);
 
         /*
          * This should not happen, we already checked the entry
          * was ours. When the hardware disagrees there has been
          * a queue corruption!
          */
-        if (unlikely(rt2x00_get_field32(word, TXD_ENTRY_OWNER_NIC) ||
-                     rt2x00_get_field32(word, TXD_ENTRY_VALID))) {
-                ERROR(entry->queue->rt2x00dev,
+        if (unlikely(rt2x00dev->ops->lib->get_entry_state(entry))) {
+                ERROR(rt2x00dev,
                       "Corrupt queue %d, accessing entry which is not ours.\n"
                       "Please file bug report to %s.\n",
                       entry->queue->qid, DRV_PROJECT);
@@ -76,14 +73,12 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
         struct queue_entry *entry;
         struct queue_entry_priv_pci *entry_priv;
         struct skb_frame_desc *skbdesc;
-        u32 word;
 
         while (1) {
                 entry = rt2x00queue_get_entry(queue, Q_INDEX);
                 entry_priv = entry->priv_data;
-                rt2x00_desc_read(entry_priv->desc, 0, &word);
 
-                if (rt2x00_get_field32(word, RXD_ENTRY_OWNER_NIC))
+                if (rt2x00dev->ops->lib->get_entry_state(entry))
                         break;
 
                 /*