summaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-11-25 15:47:18 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-11-25 15:47:18 -0500
commitd5aedd7e1b2f024ced0486aeb730bc56875e5ac9 (patch)
tree8ba9d15789748952e5e02d7a8a4a8cda0e16ccfd /net/wireless/core.c
parent517543fd72d577dde2ebd9505dc4abf26d589f9a (diff)
parent24d47300d118c5909a51b7270276d749cce150a2 (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/core.c')
-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 aff959e5a1b..00a65ba3aea 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) &&