summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-05-12 19:58:12 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-05-13 15:44:42 -0400
commit34bfc411f63c8b0efb328b7574fc97bc1714cb29 (patch)
tree9b2b57cfaaf23e9003a8db79533b042b4173ff24 /net
parentf7eef3563cb3f05e7f0db992716c514af6f4d089 (diff)
downloadlinux-34bfc411f63c8b0efb328b7574fc97bc1714cb29.tar.gz
linux-34bfc411f63c8b0efb328b7574fc97bc1714cb29.tar.bz2
linux-34bfc411f63c8b0efb328b7574fc97bc1714cb29.zip
mac80211: respond to beacon loss report only once
The driver might keep reporting beacon loss until we disassociate -- catch that and don't respond to any subsequent events until the probe is either successful or we disassociate. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2806f6af7ae7..7835e7d43240 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1182,6 +1182,17 @@ void ieee80211_beacon_loss_work(struct work_struct *work)
u.mgd.beacon_loss_work);
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+ /*
+ * The driver has already reported this event and we have
+ * already sent a probe request. Maybe the AP died and the
+ * driver keeps reporting until we disassociate... We have
+ * to ignore that because otherwise we would continually
+ * reset the timer and never check whether we received a
+ * probe response!
+ */
+ if (ifmgd->flags & IEEE80211_STA_PROBEREQ_POLL)
+ return;
+
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: driver reports beacon loss from AP %pM "