diff options
| author | Moshe Benji <Moshe.Benji@intel.com> | 2013-06-03 19:27:16 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-12 14:13:39 +0200 |
| commit | 622ebe994f6866b8d46ee5d3bcc329ed65d3722d (patch) | |
| tree | e7a87e855038b4f85394ffcb221ad30d06616d60 /drivers/net/wireless/iwlwifi | |
| parent | 2edc6ec6330c7906f4dbd7f5da71be8989efc5a3 (diff) | |
| download | op-kernel-dev-622ebe994f6866b8d46ee5d3bcc329ed65d3722d.zip op-kernel-dev-622ebe994f6866b8d46ee5d3bcc329ed65d3722d.tar.gz | |
iwlwifi: fix rate control regression
Since driver does not use control.rates[0].count, we have never set that
variable. But currently, after rate control API rewrite, this is required
by mac80211. Otherwise legacy rates control does not work and we transmit
always at 1Mbit/s on pre 11n networks.
[same fix as for iwlegacy, thanks Stanislaw!]
Signed-off-by: Moshe Benji <Moshe.Benji@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rs.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/rs.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c index 907bd6e..10fbb17 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rs.c +++ b/drivers/net/wireless/iwlwifi/dvm/rs.c @@ -2799,7 +2799,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, info->control.rates[0].flags = 0; } info->control.rates[0].idx = rate_idx; - + info->control.rates[0].count = 1; } static void *rs_alloc_sta(void *priv_rate, struct ieee80211_sta *sta, diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c index 55334d5..b99fe31 100644 --- a/drivers/net/wireless/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/iwlwifi/mvm/rs.c @@ -2546,6 +2546,7 @@ static void rs_get_rate(void *mvm_r, struct ieee80211_sta *sta, void *mvm_sta, info->control.rates[0].flags = 0; } info->control.rates[0].idx = rate_idx; + info->control.rates[0].count = 1; } static void *rs_alloc_sta(void *mvm_rate, struct ieee80211_sta *sta, |
