---

yaml --- r: 202820 b: refs/heads/master c: 08daeca h: refs/heads/master v: v3
git-mirror · Jun 3, 2010 · 2ad031c · 2ad031c
1 parent dcec278
commit 2ad031c
Show file tree

Hide file tree

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