diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
| commit | 4b074b07625f603d40d4d04937f8874a00415dc4 (patch) | |
| tree | 2dffdc46e3fea0320524f483cf5ac2c058ab59f2 /net/mac80211/rate.h | |
| parent | 7d68849f40cd9169088249cc889d95c8998c3fb8 (diff) | |
| parent | ddcc347b70f298f9d624cd0e250581d831d915fb (diff) | |
| download | talos-obmc-linux-4b074b07625f603d40d4d04937f8874a00415dc4.tar.gz talos-obmc-linux-4b074b07625f603d40d4d04937f8874a00415dc4.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/rate.h')
| -rw-r--r-- | net/mac80211/rate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h index 505bc0dea074..b95e16c07081 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(); |
