rt2x00: Ensure TX-ed frames are returned in the original state.

Recent changes to the TX-done code of rt2x00 resulted in TX-ed frames not
being returned to mac80211 in the original state, and therefore with
insufficient headroom for re-transmissions.

Fix this by reverting the changes done and by ensuring we remove the inserted
L2pad by moving the header backwards instead of the data forwards.

At the same time also make sure that the rt2x00queue_remove_l2pad will not
move any memory when a frame has no data at all.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Cc: Jay Hung <Jay_Hung@ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index a3d79c7a21c65e778b0c16c6d9351e774b9f8f60..35133d8558b5af9c9de3c2b4872033a877f62ab4 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -199,15 +199,18 @@ void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length)
 
 void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length)
 {
-       unsigned int l2pad = L2PAD_SIZE(header_length);
+       /*
+        * L2 padding is only present if the skb contains more than just the
+        * IEEE 802.11 header.
+        */
+       unsigned int l2pad = (skb->len > header_length) ?
+                               L2PAD_SIZE(header_length) : 0;
 
        if (!l2pad)
                return;
 
-       memmove(skb->data + header_length, skb->data + header_length + l2pad,
-                               skb->len - header_length - l2pad);
-
-       skb_trim(skb, skb->len - l2pad);
+       memmove(skb->data + l2pad, skb->data, header_length);
+       skb_pull(skb, l2pad);
 }
 
 static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry,