2014-07-28 13:30:26

by Michal Kazior

Subject: [PATCH] cfg80211: re-enable CSA for drivers that support it

This reverts commit dda444d52496aa8ddc501561bca580f1374a96a9.

Channel switching code has been reworked and
improved significantly since the time original
locking issues were found.

Signed-off-by: Michal Kazior <[email protected]>
---
net/wireless/core.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/net/wireless/core.c b/net/wireless/core.c
index afee5e0..a207eb1 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -492,12 +492,6 @@ int wiphy_register(struct wiphy *wiphy)
int i;
u16 ifmodes = wiphy->interface_modes;

- /*
- * 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) &&
--
1.8.5.3

2014-08-11 15:05:40

by Johannes Berg

Subject: Re: [PATCH] cfg80211: re-enable CSA for drivers that support it

On Mon, 2014-07-28 at 15:21 +0200, Michal Kazior wrote:
> This reverts commit dda444d52496aa8ddc501561bca580f1374a96a9.
>
> Channel switching code has been reworked and
> improved significantly since the time original
> locking issues were found.

Applied.

johannes