From: Zhu Yi <yi.zhu@intel.com>
Date: Wed, 28 Oct 2009 20:13:52 +0000 (-0700)
Subject: mac80211: make align adjustment code support paged SKB
X-Git-Tag: v2.6.33-rc1~388^2~449^2~119
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8ce0b5892460c670b71b7a0bf96549f5e7a63d6c;p=~shefty%2Frdma-dev.git

mac80211: make align adjustment code support paged SKB

This fixed a BUG_ON in __skb_trim() when paged rx is used in
iwlwifi driver. Yes, the whole mac80211 stack doesn't support
paged SKB yet. But let's start the work slowly from small
code snippets.

Reported-and-tested-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 798fa82b6ae..c832d408187 100644
--- a/net/mac80211/rx.c
+++ b/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