Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 58 insertions, 107 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 52d12fdc0ccf..68d87f09e054 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -130,16 +130,12 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
         struct queue_entry *entry = (struct queue_entry *)urb->context;
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct txdone_entry_desc txdesc;
-        __le32 *txd = (__le32 *)entry->skb->data;
         enum data_queue_qid qid = skb_get_queue_mapping(entry->skb);
-        u32 word;
 
         if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
             !__test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
                 return;
 
-        rt2x00_desc_read(txd, 0, &word);
-
         /*
          * Remove the descriptor data from the buffer.
          */
@@ -169,124 +165,101 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
         rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);
 
         /*
-         * If the data queue was full before the txdone handler
-         * we must make sure the packet queue in the mac80211 stack
+         * If the data queue was below the threshold before the txdone
+         * handler we must make sure the packet queue in the mac80211 stack
          * is reenabled when the txdone handler has finished.
          */
-        if (!rt2x00queue_full(entry->queue))
+        if (!rt2x00queue_threshold(entry->queue))
                 ieee80211_wake_queue(rt2x00dev->hw, qid);
 }
 
-int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
-                            struct data_queue *queue, struct sk_buff *skb)
+int rt2x00usb_write_tx_data(struct queue_entry *entry)
 {
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
         struct usb_device *usb_dev = rt2x00dev_usb_dev(rt2x00dev);
-        struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);
         struct queue_entry_priv_usb *entry_priv = entry->priv_data;
         struct skb_frame_desc *skbdesc;
-        struct txentry_desc txdesc;
         u32 length;
 
-        if (rt2x00queue_full(queue))
-                return -EINVAL;
-
-        if (test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags)) {
-                ERROR(rt2x00dev,
-                      "Arrived at non-free entry in the non-full queue %d.\n"
-                      "Please file bug report to %s.\n",
-                      entry->queue->qid, DRV_PROJECT);
-                return -EINVAL;
-        }
-
-        /*
-         * Copy all TX descriptor information into txdesc,
-         * after that we are free to use the skb->cb array
-         * for our information.
-         */
-        entry->skb = skb;
-        rt2x00queue_create_tx_descriptor(entry, &txdesc);
-
         /*
          * Add the descriptor in front of the skb.
          */
-        skb_push(skb, queue->desc_size);
-        memset(skb->data, 0, queue->desc_size);
+        skb_push(entry->skb, entry->queue->desc_size);
+        memset(entry->skb->data, 0, entry->queue->desc_size);
 
         /*
          * Fill in skb descriptor
          */
-        skbdesc = get_skb_frame_desc(skb);
+        skbdesc = get_skb_frame_desc(entry->skb);
         memset(skbdesc, 0, sizeof(*skbdesc));
-        skbdesc->data = skb->data + queue->desc_size;
-        skbdesc->data_len = skb->len - queue->desc_size;
-        skbdesc->desc = skb->data;
-        skbdesc->desc_len = queue->desc_size;
+        skbdesc->desc = entry->skb->data;
+        skbdesc->desc_len = entry->queue->desc_size;
         skbdesc->entry = entry;
 
-        rt2x00queue_write_tx_descriptor(entry, &txdesc);
-
         /*
          * USB devices cannot blindly pass the skb->len as the
          * length of the data to usb_fill_bulk_urb. Pass the skb
          * to the driver to determine what the length should be.
          */
-        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev, skb);
+        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev, entry->skb);
 
-        /*
-         * Initialize URB and send the frame to the device.
-         */
-        __set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
-        usb_fill_bulk_urb(entry_priv->urb, usb_dev, usb_sndbulkpipe(usb_dev, 1),
-                          skb->data, length, rt2x00usb_interrupt_txdone, entry);
-        usb_submit_urb(entry_priv->urb, GFP_ATOMIC);
-
-        rt2x00queue_index_inc(queue, Q_INDEX);
+        usb_fill_bulk_urb(entry_priv->urb, usb_dev,
+                          usb_sndbulkpipe(usb_dev, 1),
+                          entry->skb->data, length,
+                          rt2x00usb_interrupt_txdone, entry);
 
         return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);
 
-/*
- * RX data handlers.
- */
-static struct sk_buff* rt2x00usb_alloc_rxskb(struct data_queue *queue)
+static inline void rt2x00usb_kick_tx_entry(struct queue_entry *entry)
 {
-        struct sk_buff *skb;
-        unsigned int frame_size;
-        unsigned int reserved_size;
+        struct queue_entry_priv_usb *entry_priv = entry->priv_data;
 
-        /*
-         * The frame size includes descriptor size, because the
-         * hardware directly receive the frame into the skbuffer.
-         */
-        frame_size = queue->data_size + queue->desc_size;
+        if (__test_and_clear_bit(ENTRY_DATA_PENDING, &entry->flags))
+                usb_submit_urb(entry_priv->urb, GFP_ATOMIC);
+}
+
+void rt2x00usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
+                             const enum data_queue_qid qid)
+{
+        struct data_queue *queue = rt2x00queue_get_queue(rt2x00dev, qid);
+        unsigned long irqflags;
+        unsigned int index;
+        unsigned int index_done;
+        unsigned int i;
 
         /*
-         * For the allocation we should keep a few things in mind:
-         * 1) 4byte alignment of 802.11 payload
-         *
-         * For (1) we need at most 4 bytes to guarentee the correct
-         * alignment. We are going to optimize the fact that the chance
-         * that the 802.11 header_size % 4 == 2 is much bigger then
-         * anything else. However since we need to move the frame up
-         * to 3 bytes to the front, which means we need to preallocate
-         * 6 bytes.
+         * Only protect the range we are going to loop over,
+         * if during our loop a extra entry is set to pending
+         * it should not be kicked during this run, since it
+         * is part of another TX operation.
          */
-        reserved_size = 6;
+        spin_lock_irqsave(&queue->lock, irqflags);
+        index = queue->index[Q_INDEX];
+        index_done = queue->index[Q_INDEX_DONE];
+        spin_unlock_irqrestore(&queue->lock, irqflags);
 
         /*
-         * Allocate skbuffer.
+         * Start from the TX done pointer, this guarentees that we will
+         * send out all frames in the correct order.
          */
-        skb = dev_alloc_skb(frame_size + reserved_size);
-        if (!skb)
-                return NULL;
-
-        skb_reserve(skb, reserved_size);
-        skb_put(skb, frame_size);
-
-        return skb;
+        if (index_done < index) {
+                for (i = index_done; i < index; i++)
+                        rt2x00usb_kick_tx_entry(&queue->entries[i]);
+        } else {
+                for (i = index_done; i < queue->limit; i++)
+                        rt2x00usb_kick_tx_entry(&queue->entries[i]);
+
+                for (i = 0; i < index; i++)
+                        rt2x00usb_kick_tx_entry(&queue->entries[i]);
+        }
 }
+EXPORT_SYMBOL_GPL(rt2x00usb_kick_tx_queue);
 
+/*
+ * RX data handlers.
+ */
 static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 {
         struct queue_entry *entry = (struct queue_entry *)urb->context;
@@ -294,8 +267,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         struct sk_buff *skb;
         struct skb_frame_desc *skbdesc;
         struct rxdone_entry_desc rxdesc;
-        unsigned int header_size;
-        unsigned int align;
+        u8 rxd[32];
 
         if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
             !test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
@@ -315,39 +287,18 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
         skbdesc = get_skb_frame_desc(entry->skb);
         memset(skbdesc, 0, sizeof(*skbdesc));
         skbdesc->entry = entry;
+        skbdesc->desc = rxd;
+        skbdesc->desc_len = entry->queue->desc_size;
 
         memset(&rxdesc, 0, sizeof(rxdesc));
         rt2x00dev->ops->lib->fill_rxdone(entry, &rxdesc);
 
-        header_size = ieee80211_get_hdrlen_from_skb(entry->skb);
-
-        /*
-         * The data behind the ieee80211 header must be
-         * aligned on a 4 byte boundary. We already reserved
-         * 2 bytes for header_size % 4 == 2 optimization.
-         * To determine the number of bytes which the data
-         * should be moved to the left, we must add these
-         * 2 bytes to the header_size.
-         */
-        align = (header_size + 2) % 4;
-
-        if (align) {
-                skb_push(entry->skb, align);
-                /* Move entire frame in 1 command */
-                memmove(entry->skb->data, entry->skb->data + align,
-                        rxdesc.size);
-        }
-
-        /* Update data pointers, trim buffer to correct size */
-        skbdesc->data = entry->skb->data;
-        skb_trim(entry->skb, rxdesc.size);
-
         /*
          * Allocate a new sk buffer to replace the current one.
          * If allocation fails, we should drop the current frame
          * so we can recycle the existing sk buffer for the new frame.
          */
-        skb = rt2x00usb_alloc_rxskb(entry->queue);
+        skb = rt2x00queue_alloc_rxskb(entry->queue);
         if (!skb)
                 goto skip_entry;
 
@@ -519,7 +470,7 @@ int rt2x00usb_initialize(struct rt2x00_dev *rt2x00dev)
          */
         entry_size = rt2x00dev->rx->data_size + rt2x00dev->rx->desc_size;
         for (i = 0; i < rt2x00dev->rx->limit; i++) {
-                skb = rt2x00usb_alloc_rxskb(rt2x00dev->rx);
+                skb = rt2x00queue_alloc_rxskb(rt2x00dev->rx);
                 if (!skb)
                         goto exit;