leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Browse Source
This commit is contained in:
Johannes Berg
2013-12-16 11:23:45 +01:00
parent bafdc614a1 55957fb7a0
commit c4de673b77
9168 changed files with 385152 additions and 219748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/wireless/core.c
View File

@@ -440,6 +440,15 @@ 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;
/*
* There are major locking problems in nl80211/mac80211 for CSA,
* disable for all drivers until this has been reworked.
*/
wiphy->flags &= ~WIPHY_FLAG_HAS_CHANNEL_SWITCH;
#ifdef CONFIG_PM
if (WARN_ON(wiphy->wowlan &&
(wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&