From bc62a9e1c5128884957f3967c4effe0c7b8ed885 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sun, 3 Aug 2008 14:32:01 +0300
Subject: [PATCH] --- yaml --- r: 111202 b: refs/heads/master c:
 8e7cdbb6333ef7654e708bd60e50a123688dcd7b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2820801797ed..9637d4f2c51f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f698d856f65c3fea091cc303a135967965c5b880
+refs/heads/master: 8e7cdbb6333ef7654e708bd60e50a123688dcd7b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index fb8e1e742ca6..ae5a5cbabae3 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2550,9 +2550,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 	DECLARE_MAC_BUF(mac);
 	DECLARE_MAC_BUF(mac2);
 
-	if (!beacon && memcmp(mgmt->da, sdata->dev->dev_addr, ETH_ALEN))
-		return; /* ignore ProbeResp to foreign address */
-
 	beacon_timestamp = le64_to_cpu(mgmt->u.beacon.timestamp);
 
 	if (ieee80211_vif_is_mesh(&sdata->vif) && elems->mesh_id &&
@@ -2870,6 +2867,9 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
 	size_t baselen;
 	struct ieee802_11_elems elems;
 
+	if (memcmp(mgmt->da, sdata->dev->dev_addr, ETH_ALEN))
+		return; /* ignore ProbeResp to foreign address */
+
 	baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
 	if (baselen > len)
 		return;