diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-20 13:54:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-20 13:54:40 -0400 |
| commit | 028f43bc64401ead2bf86adcef1b7ffdbb170509 (patch) | |
| tree | 7fff5ae2f854874aa86b9826d3bd8197326b102f /drivers/net/wireless/intel/iwlwifi/dvm/rs.c | |
| parent | 0ef9059d4117e92f35525ce260b1f8eca2b569fa (diff) | |
| parent | bbf67e450a5dc2a595e1e7a67b4869f1a7f5a338 (diff) | |
| download | linux-028f43bc64401ead2bf86adcef1b7ffdbb170509.tar.gz linux-028f43bc64401ead2bf86adcef1b7ffdbb170509.tar.bz2 linux-028f43bc64401ead2bf86adcef1b7ffdbb170509.zip | |
Merge tag 'mac80211-next-for-davem-2017-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
My last pull request has been a while, we now have:
* connection quality monitoring with multiple thresholds
* support for FILS shared key authentication offload
* pre-CAC regulatory compliance - only ETSI allows this
* sanity check for some rate confusion that hit ChromeOS
(but nobody else uses it, evidently)
* some documentation updates
* lots of cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/rs.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c index ff44ebc5829d..ddcd8c2d66cd 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c @@ -2720,7 +2720,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, /* Get max rate if user set max rate */ if (lq_sta) { - lq_sta->max_rate_idx = txrc->max_rate_idx; + lq_sta->max_rate_idx = fls(txrc->rate_idx_mask) - 1; if ((sband->band == NL80211_BAND_5GHZ) && (lq_sta->max_rate_idx != -1)) lq_sta->max_rate_idx += IWL_FIRST_OFDM_RATE; |