43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From b2adbfe0a1a5c4c0c3f490000cf5ee11903ae674 Mon Sep 17 00:00:00 2001
|
|
From: Shanyu Zhao <shanyu.zhao@intel.com>
|
|
Date: Thu, 11 Feb 2010 10:42:22 -0800
|
|
Subject: [PATCH 3/3] iwlwifi: fix AMSDU Rx after paged Rx patch
|
|
|
|
commit fafaf31bf9f965d91462ee115e27ef6c262b74ea upstream.
|
|
|
|
Previous patch "use paged Rx" broke AMSDU Rx functionality. If an AP
|
|
sends out A-MSDU packets the station will crash. Fix it by linearizing
|
|
skbuff for AMSDU packet before handing it to mac80211 since mac80211
|
|
doesn't support paged skbuff.
|
|
|
|
This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2155
|
|
|
|
Reported-by: Norbert Preining <preining@logic.at>
|
|
Signed-off-by: Shanyu Zhao <shanyu.zhao@intel.com>
|
|
Acked-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>
|
|
---
|
|
drivers/net/wireless/iwlwifi/iwl-rx.c | 5 ++++-
|
|
1 files changed, 4 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
|
|
index c6e6ce0..bbdfe3b 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
|
|
@@ -914,7 +914,10 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv,
|
|
if (ieee80211_is_mgmt(fc) ||
|
|
ieee80211_has_protected(fc) ||
|
|
ieee80211_has_morefrags(fc) ||
|
|
- le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG)
|
|
+ le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG ||
|
|
+ (ieee80211_is_data_qos(fc) &&
|
|
+ *ieee80211_get_qos_ctl(hdr) &
|
|
+ IEEE80211_QOS_CONTROL_A_MSDU_PRESENT))
|
|
ret = skb_linearize(skb);
|
|
else
|
|
ret = __pskb_pull_tail(skb, min_t(u16, IWL_LINK_HDR_MAX, len)) ?
|
|
--
|
|
1.7.1
|
|
|