summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-14 11:56:38 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-14 11:56:38 -0800
commit3d0beb921fa34ebf8b13e206e5473329b14deb83 (patch)
treeb7f121166e835da5e61587ce7bd18b4091b1b7be /drivers/net
parent5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6 (diff)
parent5affcd6ba2036b59a4dee3f0576ae3584e92e4f1 (diff)
downloadblackbird-op-linux-3d0beb921fa34ebf8b13e206e5473329b14deb83.tar.gz
blackbird-op-linux-3d0beb921fa34ebf8b13e206e5473329b14deb83.zip
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-rx.c5
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 6f36b6e79f5e..2dbce85404aa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -928,7 +928,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)) ?
OpenPOWER on IntegriCloud