From: Grazvydas Ignotas <notasas@gmail.com>
To: linux-wireless@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Cc: "Pavel Machek" <pavel@ucw.cz>,
"Pali Rohár" <pali.rohar@gmail.com>,
"David Gnedt" <david.gnedt@davizone.at>,
"Grazvydas Ignotas" <notasas@gmail.com>
Subject: [PATCH 4/4] wl1251: only call ieee80211_beacon_loss in managed mode
Date: Tue, 22 Apr 2014 03:09:55 +0300 [thread overview]
Message-ID: <1398125395-5579-5-git-send-email-notasas@gmail.com> (raw)
In-Reply-To: <1398125395-5579-1-git-send-email-notasas@gmail.com>
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 <notasas@gmail.com>
---
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) {
--
1.7.9.5
next prev parent reply other threads:[~2014-04-22 0:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 0:09 [PATCH 0/4] wl1251 IBSS fixes Grazvydas Ignotas
2014-04-22 0:09 ` [PATCH 1/4] Revert "wl1251: enforce changed hw encryption support on monitor state change" Grazvydas Ignotas
2014-04-22 0:09 ` [PATCH 2/4] wl1251: fix null data for IBSS Grazvydas Ignotas
2014-04-22 0:09 ` [PATCH 3/4] wl1251: fix mixed up args for join Grazvydas Ignotas
2014-04-22 0:09 ` Grazvydas Ignotas [this message]
2014-05-09 0:21 ` [PATCH 0/4] wl1251 IBSS fixes Grazvydas Ignotas
2014-05-09 20:03 ` Pali Rohár
2014-05-10 12:28 ` Pali Rohár
2014-05-30 16:18 ` Pali Rohár
2014-05-31 13:15 ` Grazvydas Ignotas
2014-05-31 13:20 ` Pali Rohár
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398125395-5579-5-git-send-email-notasas@gmail.com \
--to=notasas@gmail.com \
--cc=david.gnedt@davizone.at \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=pali.rohar@gmail.com \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).