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, 3 insertions, 4 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e8ca1cbfeb9..bb510a232d1 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -101,8 +101,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
         /*
          * Initialize all data queues.
          */
-        rt2x00queue_init_rx(rt2x00dev);
-        rt2x00queue_init_tx(rt2x00dev);
+        rt2x00queue_init_queues(rt2x00dev);
 
         /*
          * Enable radio.
@@ -576,7 +575,7 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         entry->skb = NULL;
         entry->flags = 0;
 
-        rt2x00dev->ops->lib->init_txentry(rt2x00dev, entry);
+        rt2x00dev->ops->lib->clear_entry(entry);
 
         clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
         rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);
@@ -708,7 +707,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,
         entry->skb = skb;
         entry->flags = 0;
 
-        rt2x00dev->ops->lib->init_rxentry(rt2x00dev, entry);
+        rt2x00dev->ops->lib->clear_entry(entry);
 
         rt2x00queue_index_inc(entry->queue, Q_INDEX);
 }