From patchwork Tue Apr 22 00:09:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grazvydas Ignotas X-Patchwork-Id: 4027701 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 0EE35BFF02 for ; Tue, 22 Apr 2014 00:10:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28C1620265 for ; Tue, 22 Apr 2014 00:10:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5EE9720340 for ; Tue, 22 Apr 2014 00:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754571AbaDVAKd (ORCPT ); Mon, 21 Apr 2014 20:10:33 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:42184 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754569AbaDVAKa (ORCPT ); Mon, 21 Apr 2014 20:10:30 -0400 Received: by mail-ee0-f50.google.com with SMTP id c13so3978902eek.37 for ; Mon, 21 Apr 2014 17:10:29 -0700 (PDT) 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=rIXUhcbklgVnTTl4wPBuXpIZsz8tErnNE2LZx45M7TY=; b=FyyyFYX5/Tmo9OXxiD6NI+uuMaBjjd92pEjSUCyMXT4q+B4LQl1VSWcjNSAC2MPyWo 9yXNMGLODc1HHOKjSHXX+zFbqh8fHtCqOmrg2VtBGbTR0jIYodDSNwhn2tb52vI60jGV MxXsORivec6LMblNTLRZD7banKerrvBCpzn/jQFhX3nfYnaaF+MCFcT0AZ8tHKEYJ+i7 wmYJoQurS4fasMDV1YGLKrg22Q7CUCRrt/RW60xmW854xjkfLvCER0JiVhdC8s7nxxuV B6KpviQftmYwiIMsW9ssmAfBOf5ZPQN3MEjILFb2kugMqq6KGH6OganLM172DBFfNBz/ 2bAA== X-Received: by 10.14.115.195 with SMTP id e43mr5956105eeh.76.1398125429461; Mon, 21 Apr 2014 17:10:29 -0700 (PDT) Received: from localhost.localdomain (ip-88-119-226-136.static.b4net.lt. [88.119.226.136]) by mx.google.com with ESMTPSA id x45sm107851788eef.15.2014.04.21.17.10.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Apr 2014 17:10:28 -0700 (PDT) From: Grazvydas Ignotas To: linux-wireless@vger.kernel.org, "John W. Linville" Cc: Pavel Machek , =?UTF-8?q?Pali=20Roh=C3=A1r?= , David Gnedt , Grazvydas Ignotas Subject: [PATCH 4/4] wl1251: only call ieee80211_beacon_loss in managed mode Date: Tue, 22 Apr 2014 03:09:55 +0300 Message-Id: <1398125395-5579-5-git-send-email-notasas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398125395-5579-1-git-send-email-notasas@gmail.com> References: <1398125395-5579-1-git-send-email-notasas@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 ieee80211_beacon_loss() is only to be called in managed mode, but the firmware may send the sync timeout event at any time, so do a check before calling. Signed-off-by: Grazvydas Ignotas --- drivers/net/wireless/ti/wl1251/event.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c index db01053..c986303 100644 --- a/drivers/net/wireless/ti/wl1251/event.c +++ b/drivers/net/wireless/ti/wl1251/event.c @@ -124,11 +124,12 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox) return ret; } - if (wl->vif && vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID) { + if (vector & SYNCHRONIZATION_TIMEOUT_EVENT_ID) { wl1251_debug(DEBUG_EVENT, "SYNCHRONIZATION_TIMEOUT_EVENT"); /* indicate to the stack, that beacons have been lost */ - ieee80211_beacon_loss(wl->vif); + if (wl->vif && wl->vif->type == NL80211_IFTYPE_STATION) + ieee80211_beacon_loss(wl->vif); } if (vector & REGAINED_BSS_EVENT_ID) {