From a7b246dc3be9b362aab0de0e8aa62648771bff81 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 28 Aug 2007 17:01:53 -0400
Subject: [PATCH] --- yaml --- r: 66344 b: refs/heads/master c:
 643856729e2fde781f63eb84ecb43bbad35bf1ae h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 802309bdaf40..bd7ec1fd4396 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a84f3fd141d2105d80290316bfa772ba34e9c64
+refs/heads/master: 643856729e2fde781f63eb84ecb43bbad35bf1ae
diff --git a/trunk/net/mac80211/ieee80211_common.h b/trunk/net/mac80211/ieee80211_common.h
index 77c6afb7f6a8..dd315a057510 100644
--- a/trunk/net/mac80211/ieee80211_common.h
+++ b/trunk/net/mac80211/ieee80211_common.h
@@ -48,7 +48,7 @@ enum ieee80211_msg_type {
 	ieee80211_msg_tx_callback_ack = 1,
 	ieee80211_msg_tx_callback_fail = 2,
 	/* hole at 3, was ieee80211_msg_passive_scan but unused */
-	ieee80211_msg_wep_frame_unknown_key = 4,
+	/* hole at 4, was ieee80211_msg_wep_frame_unknown_key but now unused */
 	ieee80211_msg_michael_mic_failure = 5,
 	/* hole at 6, was monitor but never sent to userspace */
 	ieee80211_msg_sta_not_assoc = 7,
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 7a6e60fcf9d0..b0959c249869 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -346,12 +346,11 @@ ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx)
 					       MAC_ARG(hdr->addr1),
 					       MAC_ARG(hdr->addr2),
 					       MAC_ARG(hdr->addr3));
-				if (!rx->local->apdev)
-					return TXRX_DROP;
-				ieee80211_rx_mgmt(
-					rx->local, rx->skb, rx->u.rx.status,
-					ieee80211_msg_wep_frame_unknown_key);
-				return TXRX_QUEUED;
+				/*
+				 * TODO: notify userspace about this
+				 * via cfg/nl80211
+				 */
+				return TXRX_DROP;
 			}
 		}
 	}