From patchwork Mon Nov 24 13:58:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5366681 Return-Path: X-Original-To: patchwork-ath10k@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 66239C11AC for ; Mon, 24 Nov 2014 14:11:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0B0E203AF for ; Mon, 24 Nov 2014 14:11:44 +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 C7484203AD for ; Mon, 24 Nov 2014 14:11:42 +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 1XsuMd-0006RG-Tu; Mon, 24 Nov 2014 14:11:39 +0000 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XsuMb-0006JO-Dv for ath10k@lists.infradead.org; Mon, 24 Nov 2014 14:11:38 +0000 Received: by mail-wg0-f52.google.com with SMTP id a1so12305520wgh.39 for ; Mon, 24 Nov 2014 06:11:10 -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=dUkBGcregskCWcsnNLXbxjkUKU3zwvQz2eKTKcLUr+Q=; b=VSU4lXe/0jFLejZE0c+gt/bC5tWptfsOEtEB7j8psDRZbbvtoVpEYG3uIu9XgL0lFI 4TpVMCTsKLdcr+PuF+elvHzdw7WtRZE6PrTU6KzA4VGO31lqiJ4Gakm/NrEz04VoX+qz +mMX7SB7GhXkqOwJv0CqHx6xQbQJGAnfuzlAw= 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=dUkBGcregskCWcsnNLXbxjkUKU3zwvQz2eKTKcLUr+Q=; b=nHZG4VLTRpLJXofTI2xRPr9hGiggdb6W7D4LjdmpyC5jEFYNMEcQJbcLZGKAba+v++ 8H9TGVzTR0QUCjCGFC+SAdZ4/dQWGtmsz37D0cExfMLaefHNGhSyi4xsJBPP3zypbJig 63lqoA8mugblWD75+rNWCsOkft2M+3sUMmsKRsCelTVavpL/QMQ9LnVJJxuJJz9rLDAB 8+WBtFWlzALTS6g47epYGAD/dU3hryRaDGnl5aM3EMpzJa9mx+ngY7m/PHVTE5vqRu6O iyu52w1A2QiEarCiPizy0RDMDeNqefkkSm1uV0/cGPnlEVzG2yiti/bkcGbCZmUKbMdj 0BKQ== X-Gm-Message-State: ALoCoQmYY0dqkAAeJnAQJY/h0FUoIEc/VxGEHYRPd+wEGrcYaexo8SX/6J1D+SifSKxYXphD6MpwW43+j+TKzL3eyDn80bM6BogTnJgkm4T2gHLFqdn1ulQ+439tG6qv9H3XVJOPOgqYLsMHyvBlSJRABKV/yyJ7cER2oQug5ooOMLDySjUMK30= X-Received: by 10.180.99.1 with SMTP id em1mr22316532wib.29.1416838270458; Mon, 24 Nov 2014 06:11:10 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id mu4sm12216866wib.2.2014.11.24.06.11.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Nov 2014 06:11:09 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH 3/3] ath10k: fix offchannel cancel failures Date: Mon, 24 Nov 2014 14:58:33 +0100 Message-Id: <1416837513-13386-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1416837513-13386-1-git-send-email-michal.kazior@tieto.com> References: <1416837513-13386-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141124_061137_688186_56F2AF9C X-CRM114-Status: UNSURE ( 9.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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, 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 When mac80211 requests driver to cancel a hw roc the driver must not call the expired() callback or else roc will fail in some cases depending on how things get scheduled. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 272a9d9..42b5982 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2184,10 +2184,10 @@ void __ath10k_scan_finish(struct ath10k *ar) case ATH10K_SCAN_IDLE: break; case ATH10K_SCAN_RUNNING: - case ATH10K_SCAN_ABORTING: if (ar->scan.is_roc) ieee80211_remain_on_channel_expired(ar->hw); - else + case ATH10K_SCAN_ABORTING: + if (!ar->scan.is_roc) ieee80211_scan_completed(ar->hw, (ar->scan.state == ATH10K_SCAN_ABORTING));