From patchwork Mon Nov 24 14:34:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 5367251 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 4D613C11AC for ; Mon, 24 Nov 2014 14:38:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8AB7B2041D for ; Mon, 24 Nov 2014 14:38:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0970203F3 for ; Mon, 24 Nov 2014 14:38:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932385AbaKXOiF (ORCPT ); Mon, 24 Nov 2014 09:38:05 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:60182 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932315AbaKXOgi (ORCPT ); Mon, 24 Nov 2014 09:36:38 -0500 Received: by mail-wg0-f50.google.com with SMTP id k14so12256407wgh.23 for ; Mon, 24 Nov 2014 06:36:37 -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=DnFgXp+2eO46P5hkN+/tr0G0R7h58/fdciNnyR4QwrU=; b=TPgN/KEPDTxeRufhNYG1CcnZSNIwvoGJud2/uYLS6mn52TYHPvSXSovhZjcQP3gpOI m+LkMNQcI8d/jB3uGhjuG1mqe3n94MjJw8Sx5ei6Jb/N7QiKcpGEiQJgyC2L3TcCeJ+a M3GF7JcusQfiX3GHRNDW7K7ZSrGMpPnt0fKp1SIICW6m4YP6C/7ttW/aaoxYy33YqNVZ 7MSGR3V5p2R3I2VuyAJR9w4KO+ytRQYSfOr6XIaETwEcwlUkQb0vBZws7DfRsFGZlnr6 krJHXk8BLhmtsXiOLeGmw6kBqrzQfHPRlc1oh3VAX4GWYSEOuVFaaQ+Tqt4QqpL+FJCu T6vA== X-Received: by 10.180.92.129 with SMTP id cm1mr21766314wib.33.1416839797141; Mon, 24 Nov 2014 06:36:37 -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.36.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Nov 2014 06:36:36 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Luciano Coelho Subject: [PATCH 62/75] iwlwifi: mvm: clear TE data if CSA time event fails to start Date: Mon, 24 Nov 2014 16:34:38 +0200 Message-Id: <1416839691-28533-62-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: Luciano Coelho If setting the CSA time event fails, we must clear the TE data, otherwise we'll try to remove it when, for instance, a disconnection occurs, causing a SYSASSERT. Signed-off-by: Luciano Coelho --- drivers/net/wireless/iwlwifi/mvm/time-event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c index ff631cc..54fafbf 100644 --- a/drivers/net/wireless/iwlwifi/mvm/time-event.c +++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c @@ -198,6 +198,7 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm, { if (!le32_to_cpu(notif->status)) { IWL_DEBUG_TE(mvm, "CSA time event failed to start\n"); + iwl_mvm_te_clear_data(mvm, te_data); return; }