diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:53 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:43 -0400 |
commit | 643856729e2fde781f63eb84ecb43bbad35bf1ae (patch) | |
tree | b6e6cec0284ad70d1536ae2817545fd4cd0a052b /net | |
parent | 1a84f3fd141d2105d80290316bfa772ba34e9c64 (diff) |
[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>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/ieee80211_common.h | 2 | ||||
-rw-r--r-- | net/mac80211/rx.c | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h index 77c6afb7f6a8..dd315a057510 100644 --- a/net/mac80211/ieee80211_common.h +++ b/net/mac80211/ieee80211_common.h | |||
@@ -48,7 +48,7 @@ enum ieee80211_msg_type { | |||
48 | ieee80211_msg_tx_callback_ack = 1, | 48 | ieee80211_msg_tx_callback_ack = 1, |
49 | ieee80211_msg_tx_callback_fail = 2, | 49 | ieee80211_msg_tx_callback_fail = 2, |
50 | /* hole at 3, was ieee80211_msg_passive_scan but unused */ | 50 | /* hole at 3, was ieee80211_msg_passive_scan but unused */ |
51 | ieee80211_msg_wep_frame_unknown_key = 4, | 51 | /* hole at 4, was ieee80211_msg_wep_frame_unknown_key but now unused */ |
52 | ieee80211_msg_michael_mic_failure = 5, | 52 | ieee80211_msg_michael_mic_failure = 5, |
53 | /* hole at 6, was monitor but never sent to userspace */ | 53 | /* hole at 6, was monitor but never sent to userspace */ |
54 | ieee80211_msg_sta_not_assoc = 7, | 54 | ieee80211_msg_sta_not_assoc = 7, |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 7a6e60fcf9d0..b0959c249869 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -346,12 +346,11 @@ ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx) | |||
346 | MAC_ARG(hdr->addr1), | 346 | MAC_ARG(hdr->addr1), |
347 | MAC_ARG(hdr->addr2), | 347 | MAC_ARG(hdr->addr2), |
348 | MAC_ARG(hdr->addr3)); | 348 | MAC_ARG(hdr->addr3)); |
349 | if (!rx->local->apdev) | 349 | /* |
350 | return TXRX_DROP; | 350 | * TODO: notify userspace about this |
351 | ieee80211_rx_mgmt( | 351 | * via cfg/nl80211 |
352 | rx->local, rx->skb, rx->u.rx.status, | 352 | */ |
353 | ieee80211_msg_wep_frame_unknown_key); | 353 | return TXRX_DROP; |
354 | return TXRX_QUEUED; | ||
355 | } | 354 | } |
356 | } | 355 | } |
357 | } | 356 | } |