From 2ad031c67777f065764bb4a012848210d1406e91 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 30 May 2010 14:53:43 +0200
Subject: [PATCH] --- yaml --- r: 202820 b: refs/heads/master c:
 08daecaead42b85b69b33d7d8429a93dfbf75b58 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ba0b121887eb..1db5cff83992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0961f112cd88176acc6d1af6ca6352f85cdf993
+refs/heads/master: 08daecaead42b85b69b33d7d8429a93dfbf75b58
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 0ade26793918..0b9898ac4d87 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1844,7 +1844,12 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)
 		return RX_QUEUED;
 	}
 
-	return RX_CONTINUE;
+	/*
+	 * After this point, we only want management frames,
+	 * so we can drop all remaining control frames to
+	 * cooked monitor interfaces.
+	 */
+	return RX_DROP_MONITOR;
 }
 
 static void ieee80211_process_sa_query_req(struct ieee80211_sub_if_data *sdata,