Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64385672 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: remove ieee80211_msg_wep_frame_unknown_key 



Neither hostapd nor wpa_supplicant really use it.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1a84f3fd

net/mac80211/ieee80211_common.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/mac80211/rx.c

+5 −6
Original line number Diff line number Diff line
@@ -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)

				/*

				 * TODO: notify userspace about this

				 * via cfg/nl80211

				 */

				return TXRX_DROP;

				ieee80211_rx_mgmt(

					rx->local, rx->skb, rx->u.rx.status,

					ieee80211_msg_wep_frame_unknown_key);

				return TXRX_QUEUED;

			}

		}

	}