diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 14:56:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 14:56:38 -0500 |
| commit | 3d0beb921fa34ebf8b13e206e5473329b14deb83 (patch) | |
| tree | b7f121166e835da5e61587ce7bd18b4091b1b7be /drivers | |
| parent | 5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6 (diff) | |
| parent | 5affcd6ba2036b59a4dee3f0576ae3584e92e4f1 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 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, | |||
| 928 | if (ieee80211_is_mgmt(fc) || | 928 | if (ieee80211_is_mgmt(fc) || |
| 929 | ieee80211_has_protected(fc) || | 929 | ieee80211_has_protected(fc) || |
| 930 | ieee80211_has_morefrags(fc) || | 930 | ieee80211_has_morefrags(fc) || |
| 931 | le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG) | 931 | le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG || |
| 932 | (ieee80211_is_data_qos(fc) && | ||
| 933 | *ieee80211_get_qos_ctl(hdr) & | ||
| 934 | IEEE80211_QOS_CONTROL_A_MSDU_PRESENT)) | ||
| 932 | ret = skb_linearize(skb); | 935 | ret = skb_linearize(skb); |
| 933 | else | 936 | else |
| 934 | ret = __pskb_pull_tail(skb, min_t(u16, IWL_LINK_HDR_MAX, len)) ? | 937 | ret = __pskb_pull_tail(skb, min_t(u16, IWL_LINK_HDR_MAX, len)) ? |