diff options
Diffstat (limited to 'net/mac80211/event.c')
| -rw-r--r-- | net/mac80211/event.c | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/net/mac80211/event.c b/net/mac80211/event.c index 2280f40b456..01ae759518f 100644 --- a/net/mac80211/event.c +++ b/net/mac80211/event.c @@ -7,37 +7,21 @@ * * mac80211 - events */ - -#include <linux/netdevice.h> -#include <net/iw_handler.h> +#include <net/cfg80211.h> #include "ieee80211_i.h" /* - * indicate a failed Michael MIC to userspace; the passed packet - * (in the variable hdr) must be long enough to extract the TKIP - * fields like TSC + * 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 net_device *dev, int keyidx, - struct ieee80211_hdr *hdr) +void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, + struct ieee80211_hdr *hdr, const u8 *tsc, + gfp_t gfp) { - union iwreq_data wrqu; - char *buf = kmalloc(128, GFP_ATOMIC); - DECLARE_MAC_BUF(mac); - - if (buf) { - /* TODO: needed parameters: count, key type, TSC */ - sprintf(buf, "MLME-MICHAELMICFAILURE.indication(" - "keyid=%d %scast addr=%s)", - keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni", - print_mac(mac, hdr->addr2)); - memset(&wrqu, 0, sizeof(wrqu)); - wrqu.data.length = strlen(buf); - wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); - kfree(buf); - } - - /* - * TODO: re-add support for sending MIC failure indication - * with all info via nl80211 - */ + cfg80211_michael_mic_failure(sdata->dev, hdr->addr2, + (hdr->addr1[0] & 0x01) ? + NL80211_KEYTYPE_GROUP : + NL80211_KEYTYPE_PAIRWISE, + keyidx, tsc, gfp); } |