From e6e9cd49ca62e4ae71d595913791fcd98211bb45 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Wed, 28 Oct 2009 13:13:52 -0700
Subject: [PATCH] --- yaml --- r: 171345 b: refs/heads/master c:
 8ce0b5892460c670b71b7a0bf96549f5e7a63d6c h: refs/heads/master i:   171343:
 d6f226bf00640f57002629bff249f20793537a63 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0d065a6262b0..b149a4afed0b 100644
--- 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
index 798fa82b6ae3..c832d408187e 100644
--- 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