From 8e5f883ef51cdf32f540762fbe8a44747b13ab1e Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 18 Sep 2008 12:24:20 +0200
Subject: [PATCH] --- yaml --- r: 111950 b: refs/heads/master c:
 2ff6a6d4e92270283432690adf53a7e5ab186d19 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 297925960e6f..87e37690bd8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79617deeebb9cf089e2bc2aad19743b1209043f6
+refs/heads/master: 2ff6a6d4e92270283432690adf53a7e5ab186d19
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 2efa4dd47b5d..c489865761bc 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1557,7 +1557,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
 	 */
 	if (sdata->vif.type != NL80211_IFTYPE_STATION &&
 	    sdata->vif.type != NL80211_IFTYPE_ADHOC)
-		return RX_DROP_MONITOR;
+		return RX_CONTINUE;
 
 	switch (mgmt->u.action.category) {
 	case WLAN_CATEGORY_BACK: