summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-11-17 10:37:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-20 07:48:58 -0800
commitc0bd0fc173635c3d98aa2530a25e73e4041fcc22 (patch)
treed737b9b6b94ef3bbcb06fdcd1ac95e2f823dd5ca /net/wireless
parent7f79e506a4521b58fcba80b49cd40c2037de6d2b (diff)
downloadkernel-common-c0bd0fc173635c3d98aa2530a25e73e4041fcc22.tar.gz
kernel-common-c0bd0fc173635c3d98aa2530a25e73e4041fcc22.tar.bz2
kernel-common-c0bd0fc173635c3d98aa2530a25e73e4041fcc22.zip
cfg80211: disable 5/10 MHz support for all drivers
commit 9f16d84ad73ea04145a5dc85c8f1067915b37eea upstream. Due to nl80211 API breakage, 5/10 MHz support is broken for all drivers. Fixing it requires adding new API, but that can't be done as a bugfix commit since that would require either updating all APIs in the trees needing the bugfix or cause different kernels to have incompatible API. Therefore, just disable 5/10 MHz support for all drivers. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index aff959e5a1b3..00a65ba3aeaa 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -451,6 +451,9 @@ int wiphy_register(struct wiphy *wiphy)
int i;
u16 ifmodes = wiphy->interface_modes;
+ /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
+ wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
+
#ifdef CONFIG_PM
if (WARN_ON(wiphy->wowlan &&
(wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&