From f49c1b2a940f5651b4db47b2d85e4a7f5c5b07c6 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Thu, 14 May 2009 21:15:36 +0300
Subject: [PATCH] --- yaml --- r: 150378 b: refs/heads/master c:
 92778180f7fca7f7797de8020900a7fea175f7e3 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/mlme.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 24f20e9e780b..17b7d419c9ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13bdcd90bbce7c07e0dda0ff31e9497b8cabf1eb
+refs/heads/master: 92778180f7fca7f7797de8020900a7fea175f7e3
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index a1944b8722e9..47bc3030ca87 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1824,6 +1824,16 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 	    memcmp(ifmgd->bssid, mgmt->bssid, ETH_ALEN) != 0)
 		return;
 
+	if (ifmgd->flags & IEEE80211_STA_PROBEREQ_POLL) {
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+		if (net_ratelimit()) {
+			printk(KERN_DEBUG "%s: cancelling probereq poll due "
+			       "to a received beacon\n", sdata->dev->name);
+		}
+#endif
+		ifmgd->flags &= ~IEEE80211_STA_PROBEREQ_POLL;
+	}
+
 	ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4);
 	ncrc = ieee802_11_parse_elems_crc(mgmt->u.beacon.variable,
 					  len - baselen, &elems,