aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-05-12 13:58:12 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-05-13 15:44:42 -0400
commit34bfc411f63c8b0efb328b7574fc97bc1714cb29 (patch)
tree9b2b57cfaaf23e9003a8db79533b042b4173ff24 /net/mac80211
parentf7eef3563cb3f05e7f0db992716c514af6f4d089 (diff)
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/mac80211')
-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)
1182 u.mgd.beacon_loss_work); 1182 u.mgd.beacon_loss_work);
1183 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 1183 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
1184 1184
1185 /*
1186 * The driver has already reported this event and we have
1187 * already sent a probe request. Maybe the AP died and the
1188 * driver keeps reporting until we disassociate... We have
1189 * to ignore that because otherwise we would continually
1190 * reset the timer and never check whether we received a
1191 * probe response!
1192 */
1193 if (ifmgd->flags & IEEE80211_STA_PROBEREQ_POLL)
1194 return;
1195
1185#ifdef CONFIG_MAC80211_VERBOSE_DEBUG 1196#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
1186 if (net_ratelimit()) { 1197 if (net_ratelimit()) {
1187 printk(KERN_DEBUG "%s: driver reports beacon loss from AP %pM " 1198 printk(KERN_DEBUG "%s: driver reports beacon loss from AP %pM "