From patchwork Mon Jul 28 13:21:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 4634621 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6660C9F401 for ; Mon, 28 Jul 2014 13:30:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2412200F4 for ; Mon, 28 Jul 2014 13:30:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B024E20155 for ; Mon, 28 Jul 2014 13:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752743AbaG1Na3 (ORCPT ); Mon, 28 Jul 2014 09:30:29 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:56322 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752850AbaG1Na0 (ORCPT ); Mon, 28 Jul 2014 09:30:26 -0400 Received: by mail-wg0-f44.google.com with SMTP id m15so7338181wgh.27 for ; Mon, 28 Jul 2014 06:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=XS4x0hGv/H31/ffRNkneDXG6cIm1OtfIN3ZLKoh2hn0=; b=KVpni1TsUermOg1TfKG/vMNHAvyv+6pN+J5BVcRPrB8GM1LvB3jsje8AA3vifIrARa 9xSv3xXJFPLKlGbhMfDYjN8UPJOZ2XteSxCSz0XhQ7SFCvptNTzainmwRAC93L2dv6Ml Ew7obuv3vFJ6hv3R8qYHFfI6516MOsm9tmvnI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XS4x0hGv/H31/ffRNkneDXG6cIm1OtfIN3ZLKoh2hn0=; b=DiWJl2v21iCifIVjuSRm003z5Zo2rgonbjnh1+j0CQESKVspqkt9HVyD3OzvXU82tN IND0NtQZin2iWHoQNco7PLazJJUHcUwKg3lnHwCQqXOKRmB7Q4pHGCGqqf2ikP3C0m1E SuM6n/oIAMBM7YJikm9AMJx13IFSjK0hl0lcSGzmxEhRwUrcMIkf6bZRhHYL0R7JB4rC IKOeXXoWRoVbG2sYJSbAkP1dniuXfFXbb1b5P1VXL/Ec+cFI/uwtCtFZdkI30/QKWWfI 192jZU2xqKq5pP08DySGDvKWg1qJTTkheQoKGtThVJ3d6tt0D1PsYwOG+rQB8qgrnf0y IMYg== X-Gm-Message-State: ALoCoQl3M27MxueTvsdnfHEe7GZDMc+sz5CuSfXSWuOuNqkUHQP4r5mEWQkYoT3kL4FiRwHYmFOVR9Oi7rTTv70qyGDkrSXZGXiX9gSVDqsDnfNFwN1uxJxkWs05oAY1rxpqV1G052p0PP6U6XjqnZrLoN9DMwQ+ew== X-Received: by 10.180.14.162 with SMTP id q2mr31484691wic.29.1406554225397; Mon, 28 Jul 2014 06:30:25 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id fe5sm11304038wjc.12.2014.07.28.06.30.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jul 2014 06:30:24 -0700 (PDT) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH] cfg80211: re-enable CSA for drivers that support it Date: Mon, 28 Jul 2014 15:21:05 +0200 Message-Id: <1406553665-16355-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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) &&