[MAC80211]: remove ieee80211_msg_wep_frame_unknown_key

Neither hostapd nor wpa_supplicant really use it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h
index 77c6afb..dd315a0 100644 (file)
--- a/net/mac80211/ieee80211_common.h
+++ b/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/net/mac80211/rx.c b/net/mac80211/rx.c
index 7a6e60f..b0959c2 100644 (file)
--- a/net/mac80211/rx.c
+++ b/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;
                        }
                }
        }