---

yaml --- r: 195251 b: refs/heads/master c: 058897a h: refs/heads/master i: 195249: 9aeaed5 195247: 54e52ce v: v3
git-mirror · May 12, 2010 · 141ad55 · 141ad55
1 parent c8ff552
commit 141ad55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffdc4cbe5b17c83af779f45de8536c6ece297e42
+refs/heads/master: 058897a4e93a6fc6d331e2ef591b2d6571431265
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -1252,6 +1252,12 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
 	if (skb_linearize(rx->skb))
 		return RX_DROP_UNUSABLE;
 
+	/*
+	 *  skb_linearize() might change the skb->data and
+	 *  previously cached variables (in this case, hdr) need to
+	 *  be refreshed with the new data.
+	 */
+	hdr = (struct ieee80211_hdr *)rx->skb->data;
 	seq = (sc & IEEE80211_SCTL_SEQ) >> 4;
 
 	if (frag == 0) {