diff mbox

[v2] mac80211: notify NSS changed when IBSS and HT

Message ID 1418806852-558-1-git-send-email-janusz.dziedzic@tieto.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Janusz.Dziedzic@tieto.com Dec. 17, 2014, 9 a.m. UTC 
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>
---
 net/mac80211/ibss.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Johannes Berg Dec. 17, 2014, 10:47 a.m. UTC | #1 
On Wed, 2014-12-17 at 10:00 +0100, Janusz Dziedzic wrote:
> 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.

Applied.

johannes
diff mbox

Patch

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 509bc15..b606b53 100644
--- 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();