diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-02-14 11:56:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 11:56:38 -0800 |
| commit | 3d0beb921fa34ebf8b13e206e5473329b14deb83 (patch) | |
| tree | b7f121166e835da5e61587ce7bd18b4091b1b7be | |
| parent | sfc: Fix SFE4002 initialisation (diff) | |
| parent | mac80211: fix handling of null-rate control in rate_control_get_rate (diff) | |
| download | linux-dev-3d0beb921fa34ebf8b13e206e5473329b14deb83.tar.xz linux-dev-3d0beb921fa34ebf8b13e206e5473329b14deb83.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 5 | ||||
| -rw-r--r-- | net/mac80211/rate.c | 3 |
2 files changed, 7 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)) ? diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index b9007f80cb92..12a2bff7dcdb 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -245,6 +245,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, 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 { |