---

yaml --- r: 224597 b: refs/heads/master c: 387e688 h: refs/heads/master i: 224595: 5fe98a8 v: v3
git-mirror · Nov 17, 2010 · ecf4143 · ecf4143
1 parent 92a7dcc
commit ecf4143
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a
+refs/heads/master: 387e68846413f3dcfc5a5afca9841430057e3340
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -204,8 +204,10 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length)
 	if (!l2pad)
 		return;
 
-	memmove(skb->data + l2pad, skb->data, header_length);
-	skb_pull(skb, l2pad);
+	memmove(skb->data + header_length, skb->data + header_length + l2pad,
+				skb->len - header_length - l2pad);
+
+	skb_trim(skb, skb->len - l2pad);
 }
 
 static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry,