From patchwork Mon Mar 9 13:20:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5967401 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 19C92BF440 for ; Mon, 9 Mar 2015 13:23:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FFB02024F for ; Mon, 9 Mar 2015 13:23:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA6AD2024D for ; Mon, 9 Mar 2015 13:23:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753453AbbCINXO (ORCPT ); Mon, 9 Mar 2015 09:23:14 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:45797 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900AbbCINXN (ORCPT ); Mon, 9 Mar 2015 09:23:13 -0400 Received: by lamq1 with SMTP id q1so6909917lam.12 for ; Mon, 09 Mar 2015 06:23:11 -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=YXcrWnFaj3WzW+UI9RwOCGmPNfYLqG66kzzokp8Qznw=; b=D5gZJuNZcSKXWzsDwwRgCi6UKgjzn10PEl7rzaGQWQcB3f0QehoaoZbbi749mR2OF+ ilG0qkSdGVRa9Z8mVdZ1ztXbFdKNpNNCbgt0bOUvmRtfKmEayAUT5emlDkDvRxJBXLFC oau1H9kBAh9Aqj8K83rAzfhfhv0hLpbYabJag= 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=YXcrWnFaj3WzW+UI9RwOCGmPNfYLqG66kzzokp8Qznw=; b=I5E0SdwaQ7J0wItytnPi9Avl8q4SVU9Ok3SU1oSq7eZEWJ05cChACRX5Uw0GJ3XomS 3hvY1rFvk70JunV0jmV7X5Yl9vjqqzIQaCof+dT7kn3QK79fkLmwnWL25W5aEH24/pJD +6zFD3yvk0IdNzRYySso11SoU2koGDiseJLfv1rXrsw/31Vz7DXqwF/0KfzxFCUrFc6B pE4+Qr7anktIJn8IChEsPNBLfLTJU8S0CUJX9297NdvkhoD+Uhv/XPNcaQpJg6J137TN LmE/PXgH32bYVmcWRSWzxCUu9Lo5lheyGk4BAiIpfNTJaDGt6V39ZpWIEPMrrbFh5ES/ PcnQ== X-Gm-Message-State: ALoCoQkjzLbrrJ7/kGERR5ocODej2N7mITBt+fHaqfV4nWOmceiMEPMwVAOXyarErVk034xm1ogvzO9hrWIBrI4Zz+4bk/yHJ/eYIeG6ccLUN1Z4ye+FUl/kvfdkWZjkoTA77K+U07iq X-Received: by 10.152.36.226 with SMTP id t2mr24376877laj.53.1425907391863; Mon, 09 Mar 2015 06:23:11 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id ju14sm452199lab.8.2015.03.09.06.23.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Mar 2015 06:23:11 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH] ath10k: fix CAC regression Date: Mon, 9 Mar 2015 14:20:55 +0100 Message-Id: <1425907255-14083-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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 Patch `ath10k: fix interrupt storm` introduced a regression. The condition responsible for bringing up monitor vdev was broken and it was never started for CAC so effectivelly CAC would not detect radar pulses. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 1138f4f..9887e09 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -856,7 +856,7 @@ static int ath10k_monitor_recalc(struct ath10k *ar) lockdep_assert_held(&ar->conf_mutex); should_start = ar->monitor || - !ath10k_mac_should_disable_promisc(ar); + !ath10k_mac_should_disable_promisc(ar) || test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags); ath10k_dbg(ar, ATH10K_DBG_MAC,