From patchwork Mon Jan 20 14:21:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3513011 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 18537C02DD for ; Mon, 20 Jan 2014 14:25:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CAEA2017B for ; Mon, 20 Jan 2014 14:25:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0108020170 for ; Mon, 20 Jan 2014 14:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753515AbaATOZr (ORCPT ); Mon, 20 Jan 2014 09:25:47 -0500 Received: from mail-ea0-f171.google.com ([209.85.215.171]:52726 "EHLO mail-ea0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753519AbaATOZp (ORCPT ); Mon, 20 Jan 2014 09:25:45 -0500 Received: by mail-ea0-f171.google.com with SMTP id h10so3167879eak.30 for ; Mon, 20 Jan 2014 06:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9EONCjGk6QSZ1HMzfF0oHKJcEW+/Tawdwskj9+wu4I0=; b=wwmiFV2yN5nm6lJeX2H7P9JkAfEUYM6o+0rVrYbT1bOFGchfovaS3R39sdgT5R3b40 8q2fBRQR07IDcBK8dZHdtuqI/isdjgim/8f7AN05ww0p+eDv9nXp7bBCvG0S3E+uJUyE tPjpVvR5HJECvB+Wy93hTqnXpWSYjzWAVowtk= 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:in-reply-to :references; bh=9EONCjGk6QSZ1HMzfF0oHKJcEW+/Tawdwskj9+wu4I0=; b=ZzH4W8pV0l+jr/b+zpwEy2U8ax+Nto0+UHxOmLLsUDT2niJdM7KFRsHmuLxjAkev76 hgCcBbrAN9nQqiEU/GDiI4/eN5jgjme7q7XvZzrQTpzAWqGYiqiFT72Jmq5vxwwItcYp cjwYRwD5389mS5D+MykbvdUEm4oEzelV13P2YuaSHM3pRj/M9n8iN1GqBsM6Eha6B0ew HmzdOgqEKsaEnDwhyQlY1eYGlz7VNehrqCFTBqrVc0iYuz+FmOVT6ZRvsfb3Us+SXEtS k/0S2AXEuBJ1NDTptOWAU6aQV0CgyJgz4VeDdLuc/eD8EOWzIFkQgczPnlUg2V5fHbWD D60g== X-Gm-Message-State: ALoCoQkwsmZv0GFQjW1VWMucfaQuO8JJAEWabwBnHWfE2khJaHV2HVRPt6DsIHL58gdRgT3XELQ/YTGDKDULVwwXMtBgykui/1vc1C6mGDjsdOvsTA9GFm4= X-Received: by 10.14.126.1 with SMTP id a1mr2617285eei.81.1390227944397; Mon, 20 Jan 2014 06:25:44 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id 46sm3702597ees.4.2014.01.20.06.25.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jan 2014 06:25:43 -0800 (PST) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH 7/7] Revert "cfg80211: disable CSA for all drivers" Date: Mon, 20 Jan 2014 15:21:10 +0100 Message-Id: <1390227670-19030-8-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> References: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> 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.3 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. Re-enable CSA as the locking issues have been solved. 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 d89dee2..aa3def7 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -443,12 +443,6 @@ int wiphy_register(struct wiphy *wiphy) /* 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) &&