From patchwork Mon Nov 24 14:34:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 5367461 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 C8FD79F39D for ; Mon, 24 Nov 2014 14:40:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 123932041D for ; Mon, 24 Nov 2014 14:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 474D1203F3 for ; Mon, 24 Nov 2014 14:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754471AbaKXOkD (ORCPT ); Mon, 24 Nov 2014 09:40:03 -0500 Received: from mail-wi0-f171.google.com ([209.85.212.171]:33478 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932200AbaKXOfw (ORCPT ); Mon, 24 Nov 2014 09:35:52 -0500 Received: by mail-wi0-f171.google.com with SMTP id bs8so5887126wib.4 for ; Mon, 24 Nov 2014 06:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+eqOCy5geRHPBdYb8VWTizlIiKlW5HwKz5anJd6Pplc=; b=ifZYUnMOF1Z1PnsVuRj5JWkFOIvtp7MkObs6hRtfrRXYxsDKH4SPPswKqLgAoNBtzf h9JKJMqqPu4eMoQBjq5L+G0DSr8+qReHsAZVqJpfSB5+63sS99KaOxHHyKVVePFgSB/c 88OPOij1qP0CkaZwLT8bo67pLttcQp+BuTW+x3RF/DCXe9GamutL0FFl50U2ARzSp+f1 LOIcQkTfmkR6phQQr9YST14ldMWjTu6pYM3t1bc2at/N4c1dLbUM4VGpbPTBY2CnPbYq AfynG9dugGrqVk0gHbOQc4nykk0YgbKiJNlRfdIC6wx3yNQUt9ADhTLX/MNTJVuP70qZ XQqA== X-Received: by 10.180.84.98 with SMTP id x2mr10503908wiy.14.1416839751714; Mon, 24 Nov 2014 06:35:51 -0800 (PST) Received: from localhost.localdomain (46-116-150-134.bb.netvision.net.il. [46.116.150.134]) by mx.google.com with ESMTPSA id n3sm21274744wjz.21.2014.11.24.06.35.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Nov 2014 06:35:51 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: David Spinadel , Emmanuel Grumbach Subject: [PATCH 34/75] iwlwifi: mvm: remove warning on unknown scan complete Date: Mon, 24 Nov 2014 16:34:10 +0200 Message-Id: <1416839691-28533-34-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: 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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: David Spinadel Remove warning on scan complete with unknown ID, since this scan could be already cleared in abort flow. Signed-off-by: David Spinadel Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/scan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index b6719b6..e5294d0 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -1951,8 +1951,10 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm, bool sched = !!(uid & IWL_UMAC_SCAN_UID_SCHED_SCAN); int uid_idx = iwl_mvm_find_scan_uid(mvm, uid); - if (WARN(uid_idx >= IWL_MVM_MAX_SIMULTANEOUS_SCANS, - "Scan notification for uknown scan ID\n")) + /* + * Scan uid may be set to zero in case of scan abort request from above. + */ + if (uid_idx >= IWL_MVM_MAX_SIMULTANEOUS_SCANS) return 0; IWL_DEBUG_SCAN(mvm,