---

yaml --- r: 237017 b: refs/heads/master c: 771bbd0 h: refs/heads/master i: 237015: 678ef9b v: v3
git-mirror · Feb 3, 2011 · 5a810a6 · 5a810a6
1 parent e60222a
commit 5a810a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 		}