Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / net / mac80211 / event.c

diff --git a/net/mac80211/event.c b/net/mac80211/event.c
index 8de60de70bc9bffa32a4fea6dc3b7641f139c563..f288d01a634448cafc75983f947cc83f9cad68e2 100644 (file)
--- a/net/mac80211/event.c
+++ b/net/mac80211/event.c
@@ -12,31 +12,31 @@
 #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 ieee80211_sub_if_data *sdata, int keyidx,
-                                    struct ieee80211_hdr *hdr)
+                                    struct ieee80211_hdr *hdr, const u8 *tsc)
 {
        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)",
+                       "keyid=%d %scast addr=%pM)",
                        keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
-                       print_mac(mac, hdr->addr2));
+                       hdr->addr2);
                memset(&wrqu, 0, sizeof(wrqu));
                wrqu.data.length = strlen(buf);
                wireless_send_event(sdata->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);
 }