From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 1 Feb 2011 11:23:05 +0000 (+0200)
Subject: mac80211: pass up beacons from external BSS when operating as AP
X-Git-Tag: v2.6.39-rc1~468^2~403^2~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=771bbd09f7febb854dd7c30f983aa57535f9e8c9;p=karo-tx-linux.git

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>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d78d6fc333d2..c08b8e90bbcb 100644
--- a/net/mac80211/rx.c
+++ b/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;
 		}