commit 771bbd09f7febb854dd7c30f983aa57535f9e8c9
author Arik Nemtsov <arik@wizery.com> Tue Feb 01 13:23:05 2011 +0200
committer John W. Linville <linville@tuxdriver.com> Thu Feb 03 16:44:44 2011 -0500
tree 2943cd110d0020596b227fe56ccfc7d285e85426
parent d057e5a381cbaec5632117bf62ba49438ab16214

mac80211: pass up beacons from external BSS when operating as AP

Beacons from external BSSes are required for updating overlapping BSS
info (i.e. ERP protection). Pass them up unconditionally.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/rx.c

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d78d6fc..c08b8e9 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2698,7 +2698,8 @@
 				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;
 		}