From 5a810a686eca27ebeff5d8ea2ffaf459043ad9c9 Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 1 Feb 2011 13:23:05 +0200
Subject: [PATCH] --- yaml --- r: 237017 b: refs/heads/master c:
 771bbd09f7febb854dd7c30f983aa57535f9e8c9 h: refs/heads/master i:   237015:
 678ef9b8f17d20f02bc01b9e9705835b23aa295a v: v3

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

diff --git a/[refs] b/[refs]
index 2ebf383f261c..e47a5b1f8c92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d057e5a381cbaec5632117bf62ba49438ab16214
+refs/heads/master: 771bbd09f7febb854dd7c30f983aa57535f9e8c9
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index d78d6fc333d2..c08b8e90bbcb 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -2698,7 +2698,8 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
 				return 0;
 		} else if (!ieee80211_bssid_match(bssid,
 					sdata->vif.addr)) {
-			if (!(status->rx_flags & IEEE80211_RX_IN_SCAN))
+			if (!(status->rx_flags & IEEE80211_RX_IN_SCAN) &&
+			    !ieee80211_is_beacon(hdr->frame_control))
 				return 0;
 			status->rx_flags &= ~IEEE80211_RX_RA_MATCH;
 		}