From 9ca4aef6dcfcf1795cdb7f59520e1130fd9b018f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 4 Nov 2011 11:18:13 +0100
Subject: [PATCH] --- yaml --- r: 277782 b: refs/heads/master c:
 21fc756087d7659d86c344c0b38229313afc6c7c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7214904d7375..a4f305429178 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28946da763e8b8d8ffd01ab861b684a4afb4bc3b
+refs/heads/master: 21fc756087d7659d86c344c0b38229313afc6c7c
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index c8a7076f9bb8..e832e0dcab3c 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -866,6 +866,13 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
 			    rx->sdata->control_port_protocol)
 				return RX_CONTINUE;
 		}
+
+		if (rx->sdata->vif.type == NL80211_IFTYPE_AP &&
+		    cfg80211_rx_spurious_frame(rx->sdata->dev,
+					       hdr->addr2,
+					       GFP_ATOMIC))
+			return RX_DROP_UNUSABLE;
+
 		return RX_DROP_MONITOR;
 	}