mac80211: notify NSS changed when IBSS and HT

When using IBSS in HT mode, we always get NSS=1
in rc_update callback. Force NSS recalculation when
rates updated and notify driver that NSS changed.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 509bc157ce5551700db59e380d180c486b44f097..b606b53a49a7d92e178eb502f18469bd9da7a5cd 100644 (file)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -1069,9 +1069,16 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                }
 
                if (sta && rates_updated) {
-                       drv_sta_rc_update(local, sdata, &sta->sta,
-                                         IEEE80211_RC_SUPP_RATES_CHANGED);
+                       u32 changed = IEEE80211_RC_SUPP_RATES_CHANGED;
+                       u8 rx_nss = sta->sta.rx_nss;
+
+                       /* Force rx_nss recalculation */
+                       sta->sta.rx_nss = 0;
                        rate_control_rate_init(sta);
+                       if (sta->sta.rx_nss != rx_nss)
+                               changed |= IEEE80211_RC_NSS_CHANGED;
+
+                       drv_sta_rc_update(local, sdata, &sta->sta, changed);
                }
 
                rcu_read_unlock();