From patchwork Fri Feb 27 23:10:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filip Ayazi X-Patchwork-Id: 5904021 X-Patchwork-Delegate: johannes@sipsolutions.net 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 51C2F9F269 for ; Fri, 27 Feb 2015 23:11:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74D2D202F2 for ; Fri, 27 Feb 2015 23:11:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A95AA2034B for ; Fri, 27 Feb 2015 23:11:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755597AbbB0XLL (ORCPT ); Fri, 27 Feb 2015 18:11:11 -0500 Received: from mail-we0-f176.google.com ([74.125.82.176]:35400 "EHLO mail-we0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755244AbbB0XLJ (ORCPT ); Fri, 27 Feb 2015 18:11:09 -0500 Received: by wevl61 with SMTP id l61so23181708wev.2; Fri, 27 Feb 2015 15:11:08 -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; bh=Ey3kLC54DdT055F+kGPoIDrAYhUnYizR29e5JL825c0=; b=lmB2RlPK6pd5qXLa0DGEb4sIVRzWddbm1UcCuIvvIyu9fIIZgvSg8ff9EWf+GJEJT3 0K2tXpicBHulxR2UTuJESRYy/5qJXRmFBRD8V2Ap4ejX6zV/sWch41ei3I0UKNh8GhjN xRowlTR4DmH7Pbmmr4KS1etn9zOlMRzOMZ5DMaONguDkuVgfzWOnimOp4quKseTxPeOo 6XvxKaCv3gG4E+AcVwsmW6QJTtYGlyApWGK6unfJsScCtdRCv4LZOKyiADixZ0btcYX0 /vX3qugJ94t2BdLxmjFogTQhKl6gu4LWEHyuWf2kcy2zMxmmhtp/SMj3Oey4TXB4Y8nB nzgw== X-Received: by 10.194.133.68 with SMTP id pa4mr33280172wjb.26.1425078668083; Fri, 27 Feb 2015 15:11:08 -0800 (PST) Received: from localhost.localdomain (78-141-72-200.dynamic.orange.sk. [78.141.72.200]) by mx.google.com with ESMTPSA id y14sm7875630wjr.39.2015.02.27.15.11.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Feb 2015 15:11:07 -0800 (PST) From: Filip Ayazi To: kvalo@codeaurora.org Cc: ilw@linux.intel.com, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Filip Ayazi Subject: [PATCH] iwlwifi: mvm: check time event is over before disconnecting Date: Sat, 28 Feb 2015 00:10:00 +0100 Message-Id: <1425078600-29882-1-git-send-email-filipayazi@gmail.com> X-Mailer: git-send-email 1.9.1 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 On the 7260 time event was often ended before end_time and connections failed with "No association and the time event is over already...". This checks that the time event is actually over before disconnecting. Signed-off-by: Filip Ayazi --- drivers/net/wireless/iwlwifi/mvm/time-event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c index 54fafbf..b0aa892 100644 --- a/drivers/net/wireless/iwlwifi/mvm/time-event.c +++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c @@ -256,7 +256,8 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm, } } - if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_END) { + if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_END && + time_after(jiffies, te_data->end_jiffies)) { IWL_DEBUG_TE(mvm, "TE ended - current time %lu, estimated end %lu\n", jiffies, te_data->end_jiffies);