aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-11-07 12:12:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-11-07 12:12:08 +0000
commit0afee7182025d84c771c521281799b9e76f09962 (patch)
tree85324860d4943366f286891b2be0d4c447dad4e8 /package/kernel/mac80211
parent2e29046a9efbb9fcfabbf70c54b9f3026fcf4466 (diff)
downloadupstream-0afee7182025d84c771c521281799b9e76f09962.tar.gz
upstream-0afee7182025d84c771c521281799b9e76f09962.tar.bz2
upstream-0afee7182025d84c771c521281799b9e76f09962.zip
mac80211: disable a broken feature that was merged with the last update
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 47402
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r--package/kernel/mac80211/patches/314-mac80211-don-t-advertise-NL80211_FEATURE_FULL_AP_CLI.patch28
-rw-r--r--package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch2
2 files changed, 29 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/314-mac80211-don-t-advertise-NL80211_FEATURE_FULL_AP_CLI.patch b/package/kernel/mac80211/patches/314-mac80211-don-t-advertise-NL80211_FEATURE_FULL_AP_CLI.patch
new file mode 100644
index 0000000000..7f6e9c89bd
--- /dev/null
+++ b/package/kernel/mac80211/patches/314-mac80211-don-t-advertise-NL80211_FEATURE_FULL_AP_CLI.patch
@@ -0,0 +1,28 @@
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Wed, 4 Nov 2015 14:09:02 +0100
+Subject: [PATCH] mac80211: don't advertise
+ NL80211_FEATURE_FULL_AP_CLIENT_STATE
+
+For now, this feature doesn't actually work. To avoid shipping a
+kernel that has it enabled but where it can't be used disable it
+for now - we can re-enable it when it's fixed.
+
+This partially reverts 44674d9c2267 ("mac80211: advertise support
+for full station state in AP mode").
+
+Cc: Ayala Beker <ayala.beker@intel.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -541,8 +541,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+ NL80211_FEATURE_HT_IBSS |
+ NL80211_FEATURE_VIF_TXPOWER |
+ NL80211_FEATURE_MAC_ON_CREATE |
+- NL80211_FEATURE_USERSPACE_MPM |
+- NL80211_FEATURE_FULL_AP_CLIENT_STATE;
++ NL80211_FEATURE_USERSPACE_MPM;
+
+ if (!ops->hw_scan)
+ wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
index be7bd58a0e..8bbac4d90e 100644
--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
@@ -119,7 +119,7 @@
if (local->hw.conf.power_level != power) {
changed |= IEEE80211_CONF_CHANGE_POWER;
local->hw.conf.power_level = power;
-@@ -580,6 +586,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+@@ -579,6 +585,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
IEEE80211_RADIOTAP_MCS_HAVE_BW;
local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;