Patch "mac80211: initialize SMPS field in HT capabilities" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

mac80211: initialize SMPS field in HT capabilities

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mac80211-initialize-smps-field-in-ht-capabilities.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Felix Fietkau <[email protected]>
Date: Fri, 13 Jan 2017 11:28:25 +0100
Subject: mac80211: initialize SMPS field in HT capabilities

From: Felix Fietkau <[email protected]>

[ Upstream commit 43071d8fb3b7f589d72663c496a6880fb097533c ]

ibss and mesh modes copy the ht capabilites from the band without overriding the SMPS state. Unfortunately the default value 0 for the SMPS field means static SMPS instead of disabled.

This results in HT ibss and mesh setups using only single-stream rates, even though SMPS is not supposed to be active.

Initialize SMPS to disabled for all bands on ieee80211_hw_register to ensure that the value is sane where it is not overriden with the real SMPS state.

---
 net/mac80211/main.c |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

@@ -891,12 +891,17 @@ int ieee80211_register_hw(struct ieee802
 		supp_ht = supp_ht || sband->ht_cap.ht_supported;
 		supp_vht = supp_vht || sband->vht_cap.vht_supported;
 
-		if (sband->ht_cap.ht_supported)
-			local->rx_chains =
-				max(ieee80211_mcs_to_chains(&sband->ht_cap.mcs),
-				    local->rx_chains);
+		if (!sband->ht_cap.ht_supported)
+			continue;
 
 		/* TODO: consider VHT for RX chains, hopefully it's the same */
+		local->rx_chains =
+			max(ieee80211_mcs_to_chains(&sband->ht_cap.mcs),
+			    local->rx_chains);
+
+		/* no need to mask, SM_PS_DISABLED has all bits set */
+		sband->ht_cap.cap |= WLAN_HT_CAP_SM_PS_DISABLED <<
+			             IEEE80211_HT_CAP_SM_PS_SHIFT;
 	}
 
 	/* if low-level driver supports AP, we also support VLAN */

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/mac80211-initialize-smps-field-in-ht-capabilities.patch queue-4.4/mips-ath79-fix-regression-in-pci-window-initialization.patch