mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
This commit is contained in:
commit
3d0beb921f
2 changed files with 7 additions and 1 deletions
|
|
@ -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)) ?
|
||||
|
|
|
|||
Loading…
Reference in a new issue