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: 5967411 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C4AA89F2A9 for ; Mon, 9 Mar 2015 13:23:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 036C520254 for ; Mon, 9 Mar 2015 13:23:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B1582024F for ; Mon, 9 Mar 2015 13:23:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YUxeh-0002Pn-Os; Mon, 09 Mar 2015 13:23:35 +0000 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YUxeg-0002Mj-6s for ath10k@lists.infradead.org; Mon, 09 Mar 2015 13:23:34 +0000 Received: by lbjb6 with SMTP id b6so35655720lbj.9 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=ULIEK/iHlAATKazRTPjjueMos8sekPgUpR3Ti227gygTgxp8DMHA8D3DSrTVgikc3t K+HzF+1iPnGuSsr2S+tz6u2oMGd1VWowXeea9OiOpzWMtEUIRQ2OuzShq2Qf1CwzzAO1 z/gO5x0rWuDEOD4lG9/8K9V1wODQyu65hnuczdDLsVHeIuVct1VQEcLKqBipkWcyo+Pj fjQklIlyum9mTvyvzWfRAjMQSSVBToPDblu3LMYjBXQ9xBMAhPDbckPH/pncCA7MBwZj QyHslQ60KsveAXoJsp+J7zqnNXS4pBgryC+TB6qvaxclYr2IQKoo1yVOEcSEvfw9ldPZ mjqg== X-Gm-Message-State: ALoCoQnYiIRZddzeJMS5NKAbEkwc7XVUg6CM/tB1EjKQt7/097msycdkeTxJUfLoD30wFnzgeqKOnHOXiSHqF7qz5dnaWK7ZpSXMgaq5E5SudfPzyk1xHhK1frdI/uKm5bJ7TmC4Oa8dvBfJctiw/1tkb1t9OYIVvGc2pZH1yzphjx/fe8dYQtM= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150309_062334_426620_A57BB660 X-CRM114-Status: UNSURE ( 7.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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,