diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-02 13:20:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-02 13:20:03 -0500 |
| commit | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (patch) | |
| tree | 42528df41174b170cd30aa1da23e597fe6f43429 /net/wireless/core.c | |
| parent | 019b952843673fa6616d73335b9c27acb43ddeff (diff) | |
| parent | 0834ae3c3af44480834cce128b6fef83006e537f (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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 00a65ba3aeaa..52b865fb7351 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
| @@ -454,6 +454,12 @@ int wiphy_register(struct wiphy *wiphy) | |||
| 454 | /* support for 5/10 MHz is broken due to nl80211 API mess - disable */ | 454 | /* support for 5/10 MHz is broken due to nl80211 API mess - disable */ |
| 455 | wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ; | 455 | wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ; |
| 456 | 456 | ||
| 457 | /* | ||
| 458 | * There are major locking problems in nl80211/mac80211 for CSA, | ||
| 459 | * disable for all drivers until this has been reworked. | ||
| 460 | */ | ||
| 461 | wiphy->flags &= ~WIPHY_FLAG_HAS_CHANNEL_SWITCH; | ||
| 462 | |||
| 457 | #ifdef CONFIG_PM | 463 | #ifdef CONFIG_PM |
| 458 | if (WARN_ON(wiphy->wowlan && | 464 | if (WARN_ON(wiphy->wowlan && |
| 459 | (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && | 465 | (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && |