Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

David S. Miller
2 parents 5e2a911cec 5affcd6ba2
Showing 2 changed files Side-by-side Diff
drivers/net/wireless/iwlwifi/iwl-rx.c
net/mac80211/rate.c
@@ -928,7 +928,10 @@
 	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)) ?
@@ -245,6 +245,9 @@
 		info->control.rates[i].count = 1;
 	}
  
+	if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
+		return;
+
 	if (sta && sdata->force_unicast_rateidx > -1) {
 		info->control.rates[0].idx = sdata->force_unicast_rateidx;
 	} else {
...	...	@@ -928,7 +928,10 @@
928	928	if (ieee80211_is_mgmt(fc) \|\|
929	929	ieee80211_has_protected(fc) \|\|
930	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	935	ret = skb_linearize(skb);
933	936	else
934	937	ret = __pskb_pull_tail(skb, min_t(u16, IWL_LINK_HDR_MAX, len)) ?
...	...	@@ -245,6 +245,9 @@
245	245	info->control.rates[i].count = 1;
246	246	}
247	247
	248	+ if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
	249	+ return;
	250	+
248	251	if (sta && sdata->force_unicast_rateidx > -1) {
249	252	info->control.rates[0].idx = sdata->force_unicast_rateidx;
250	253	} else {