summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rate.h
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2013-12-02 11:54:07 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-12-02 15:42:16 +0100
commitddcc347b70f298f9d624cd0e250581d831d915fb (patch)
treeb562736a73e2b416e725495d84d31f05491c3519 /net/mac80211/rate.h
parentmac80211: don't leak next beacon when csa is aborted (diff)
downloadlinux-ddcc347b70f298f9d624cd0e250581d831d915fb.tar.xz
linux-ddcc347b70f298f9d624cd0e250581d831d915fb.zip
mac80211: fix rx_nss calculation for drivers with hw rc
Drivers with hardware rate control were given sta->rx_nss set to 0. This was because rx_nss calculation procedure was protected by hw/sw rate control check. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rate.h')
-rw-r--r--net/mac80211/rate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h
index 5dedc56c94db..32cdbd22c5f1 100644
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
@@ -54,6 +54,8 @@ static inline void rate_control_rate_init(struct sta_info *sta)
struct ieee80211_supported_band *sband;
struct ieee80211_chanctx_conf *chanctx_conf;
+ ieee80211_sta_set_rx_nss(sta);
+
if (!ref)
return;
@@ -67,8 +69,6 @@ static inline void rate_control_rate_init(struct sta_info *sta)
sband = local->hw.wiphy->bands[chanctx_conf->def.chan->band];
- ieee80211_sta_set_rx_nss(sta);
-
ref->ops->rate_init(ref->priv, sband, &chanctx_conf->def, ista,
priv_sta);
rcu_read_unlock();