rt2x00: Move filling of TX URB to rt2x00usb_kick_tx_entry function.

There is no need to fill the TX URB this early, and moving it to the
rt2x00usb_kick_tx_entry function allows us to merge the PCI and USB
variants of the write_tx_data function.

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

1 files changed, 17 insertions, 16 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 97597543c70b..1c91812df173 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -211,9 +211,6 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry,
                             struct txentry_desc *txdesc)
 {
         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-        struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
-        struct queue_entry_priv_usb *entry_priv = entry->priv_data;
-        u32 length;
 
         /*
          * Add the descriptor in front of the skb.
@@ -222,18 +219,6 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry,
         memset(entry->skb->data, 0, entry->queue->desc_size);
 
         /*
-         * 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(entry);
-
-        usb_fill_bulk_urb(entry_priv->urb, usb_dev,
-                          usb_sndbulkpipe(usb_dev, entry->queue->usb_endpoint),
-                          entry->skb->data, length,
-                          rt2x00usb_interrupt_txdone, entry);
-
-        /*
          * Call the driver's write_tx_datadesc function, if it exists.
          */
         if (rt2x00dev->ops->lib->write_tx_datadesc)
@@ -245,10 +230,26 @@ EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);
 
 static inline void rt2x00usb_kick_tx_entry(struct queue_entry *entry)
 {
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
         struct queue_entry_priv_usb *entry_priv = entry->priv_data;
+        u32 length;
+
+        if (test_and_clear_bit(ENTRY_DATA_PENDING, &entry->flags)) {
+                /*
+                 * 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(entry);
+
+                usb_fill_bulk_urb(entry_priv->urb, usb_dev,
+                                  usb_sndbulkpipe(usb_dev, entry->queue->usb_endpoint),
+                                  entry->skb->data, length,
+                                  rt2x00usb_interrupt_txdone, entry);
 
-        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,