summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>2010-05-11 11:22:11 -0700
committerJohn W. Linville <linville@tuxdriver.com>2010-05-12 16:39:07 -0400
commit058897a4e93a6fc6d331e2ef591b2d6571431265 (patch)
tree4f6d88f66b9cfefe9f7931566773d885b247658d /net
parentffdc4cbe5b17c83af779f45de8536c6ece297e42 (diff)
downloadop-kernel-dev-058897a4e93a6fc6d331e2ef591b2d6571431265.zip
op-kernel-dev-058897a4e93a6fc6d331e2ef591b2d6571431265.tar.gz
mac80211: fix paged defragmentation
Paged RX skb patch broke the defragmentation. We need to read hdr again after linearization. It fixes following bug http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2194 Signed-off-by: Zhu, Yi <yi.zhu@intel.com> Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index e4f325f..8fa9955 100644
--- a/net/mac80211/rx.c
+++ b/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) {
OpenPOWER on IntegriCloud