From 703515f889124248480f39d65f8704548cbf1c09 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 24 Feb 2017 11:57:27 +0100 Subject: mac80211: sync with master branch as of 9edff13abd97 Includes the following changes: 9edff13abd mac80211: disable potentially harmful PS software retry for A-MPDU sessions 75216a76b0 mac80211: backport upstream fix for CSA in IBSS mode 368cc8ef47 mac80211: update brcmfmac backporting brcmf_err cleanups 66a63d25c4 mac80211: fix build on linux 3.18 9eacb9d7fc rt2x00: mt7620: lots of improvements fd94fa61a7 mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9 649e766a64 mac80211: update to wireless-testing 2017-01-31 47540afa5d ath9k: add a warning to the tx99 config option b367eef21d mac80211: rt2x00: add support for external LNA on MT7620 9200e168f2 mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau --- ...-initialize-SMPS-field-in-HT-capabilities.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 package/kernel/mac80211/patches/348-mac80211-initialize-SMPS-field-in-HT-capabilities.patch (limited to 'package/kernel/mac80211/patches/348-mac80211-initialize-SMPS-field-in-HT-capabilities.patch') diff --git a/package/kernel/mac80211/patches/348-mac80211-initialize-SMPS-field-in-HT-capabilities.patch b/package/kernel/mac80211/patches/348-mac80211-initialize-SMPS-field-in-HT-capabilities.patch deleted file mode 100644 index 118f535..0000000 --- a/package/kernel/mac80211/patches/348-mac80211-initialize-SMPS-field-in-HT-capabilities.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Felix Fietkau -Date: Wed, 11 Jan 2017 23:30:20 +0100 -Subject: [PATCH] mac80211: initialize SMPS field in HT capabilities - -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. - -Reported-by: Elektra Wagenrad -Signed-off-by: Felix Fietkau ---- - ---- a/net/mac80211/main.c -+++ b/net/mac80211/main.c -@@ -908,10 +908,15 @@ 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; -+ -+ local->rx_chains = -+ max(ieee80211_mcs_to_chains(&sband->ht_cap.mcs), -+ local->rx_chains); -+ -+ sband->ht_cap.cap |= WLAN_HT_CAP_SM_PS_DISABLED << -+ IEEE80211_HT_CAP_SM_PS_SHIFT; - - /* TODO: consider VHT for RX chains, hopefully it's the same */ - } -- cgit v1.1