[PATCH] rt2x00: Add get_tx_data_len callback function

The TX datalen must always be converted to a value rt73 and rt2500usb
understand. Both require to use a different size then skb->len.
First off this is required because the descriptor must be added,
but the second is because the value must be a multiple of either 2 or 4,
and it should not be a multiple of the USB packetmax

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

1 files changed, 17 insertions, 12 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 66e47615f2a6..73cc726c4046 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -157,9 +157,10 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
 {
         struct usb_device *usb_dev =
             interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
-        struct ieee80211_hdr *ieee80211hdr = (struct ieee80211_hdr *)skb->data;
         struct data_entry *entry = rt2x00_get_data_entry(ring);
-        u32 length = skb->len;
+        int pipe = usb_sndbulkpipe(usb_dev, 1);
+        int max_packet = usb_maxpacket(usb_dev, pipe, 1);
+        u32 length;
 
         if (rt2x00_ring_full(ring)) {
                 ieee80211_stop_queue(rt2x00dev->hw, control->queue);
@@ -178,25 +179,29 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
         /*
          * Add the descriptor in front of the skb.
          */
-        skb_push(skb, rt2x00dev->hw->extra_tx_headroom);
-        memset(skb->data, 0x00, rt2x00dev->hw->extra_tx_headroom);
+        skb_push(skb, ring->desc_size);
+        memset(skb->data, 0, ring->desc_size);
 
         rt2x00lib_write_tx_desc(rt2x00dev, (struct data_desc *)skb->data,
-                                ieee80211hdr, length, control);
+                                (struct ieee80211_hdr *)(skb->data +
+                                                         ring->desc_size),
+                                skb->len - ring->desc_size, control);
         memcpy(&entry->tx_status.control, control, sizeof(*control));
         entry->skb = skb;
 
         /*
-         * Length passed to usb_fill_urb cannot be an odd number,
-         * so add 1 byte to make it even.
+         * 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->hw->extra_tx_headroom;
-        if (length % 2)
-                length++;
+        length = rt2x00dev->ops->lib->get_tx_data_len(rt2x00dev,
+                                                      max_packet, skb);
 
+        /*
+         * Initialize URB and send the frame to the device.
+         */
         __set_bit(ENTRY_OWNER_NIC, &entry->flags);
-        usb_fill_bulk_urb(entry->priv, usb_dev,
-                          usb_sndbulkpipe(usb_dev, 1),
+        usb_fill_bulk_urb(entry->priv, usb_dev, pipe,
                           skb->data, length, rt2x00usb_interrupt_txdone, entry);
         usb_submit_urb(entry->priv, GFP_ATOMIC);