---

yaml --- r: 171345 b: refs/heads/master c: 8ce0b58 h: refs/heads/master i: 171343: d6f226b v: v3
git-mirror · Oct 30, 2009 · e6e9cd4 · e6e9cd4
1 parent 403b3e7
commit e6e9cd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddcd4c08188dc512ceb08bcc3f4f830c2dbfb5ce
+refs/heads/master: 8ce0b5892460c670b71b7a0bf96549f5e7a63d6c
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -1326,10 +1326,10 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 				skb = NULL;
 			} else {
 				u8 *data = skb->data;
-				size_t len = skb->len;
-				u8 *new = __skb_push(skb, align);
-				memmove(new, data, len);
-				__skb_trim(skb, len);
+				size_t len = skb_headlen(skb);
+				skb->data -= align;
+				memmove(skb->data, data, len);
+				skb_set_tail_pointer(skb, len);
 			}
 		}
 #endif