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

Commit 6f1f5d5f authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove event.c 



That file contains just a single function, which itself is just a
single statement to call a different function. Remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3beea351

net/mac80211/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ mac80211-y := \ 
	key.o \

	util.o \

	wme.o \

	event.o \

	chan.o \

	trace.o mlme.o \

	tdls.o \

net/mac80211/event.c

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * mac80211 - events

 */

#include <net/cfg80211.h>

#include "ieee80211_i.h"



/*

 * Indicate a failed Michael MIC to userspace. If the caller knows the TSC of

 * the frame that generated the MIC failure (i.e., if it was provided by the

 * driver or is still in the frame), it should provide that information.

 */

void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr, const u8 *tsc,

				     gfp_t gfp)

{

	cfg80211_michael_mic_failure(sdata->dev, hdr->addr2,

				     (hdr->addr1[0] & 0x01) ?

				     NL80211_KEYTYPE_GROUP :

				     NL80211_KEYTYPE_PAIRWISE,

				     keyidx, tsc, gfp);

}

net/mac80211/ieee80211_i.h

+0 −3
Original line number Diff line number Diff line
@@ -1765,9 +1765,6 @@ extern const void *const mac80211_wiphy_privid; /* for wiphy privid */ 
int ieee80211_frame_duration(enum ieee80211_band band, size_t len,

			     int rate, int erp, int short_preamble,

			     int shift);

void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,

				     struct ieee80211_hdr *hdr, const u8 *tsc,

				     gfp_t gfp);

void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,

			       bool bss_notify);

void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,

net/mac80211/wpa.c

+6 −3
Original line number Diff line number Diff line
@@ -174,9 +174,12 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx) 
	 * a driver that supports HW encryption. Send up the key idx only if

	 * the key is set.

	 */

	mac80211_ev_michael_mic_failure(rx->sdata,

	cfg80211_michael_mic_failure(rx->sdata->dev, hdr->addr2,

				     is_multicast_ether_addr(hdr->addr1) ?

				     NL80211_KEYTYPE_GROUP :

				     NL80211_KEYTYPE_PAIRWISE,

				     rx->key ? rx->key->conf.keyidx : -1,

					(void *) skb->data, NULL, GFP_ATOMIC);

				     NULL, GFP_ATOMIC);

	return RX_DROP_UNUSABLE;

}