From 27c8b2d21d1ef655320c143115d0684f0b6c9a31 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 19 Jun 2009 02:45:21 +0200
Subject: [PATCH] --- yaml --- r: 158863 b: refs/heads/master c:
 f58d4ed98bfe7b2febcd6f0d62744b623e4b8371 h: refs/heads/master i:   158861:
 03ee8d7e662fd4f725372f8e6b82f59cf2f2345f   158859:
 193fb9ce492c69a392d8ad964fc9833925dea167   158855:
 2f0dfac13882bb95d3aa4fc4c0e5ba9dbd5ef1c2   158847:
 3f0657e61b162a386a97c7a9910207142c8107a0 v: v3

---
 [refs]                     |  2 +-
 trunk/net/mac80211/event.c | 18 +-----------------
 trunk/net/wireless/mlme.c  | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 6ddb51007ef1..0fbe8378b47f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5c469108935bacfe6f45005867256801832fdce
+refs/heads/master: f58d4ed98bfe7b2febcd6f0d62744b623e4b8371
diff --git a/trunk/net/mac80211/event.c b/trunk/net/mac80211/event.c
index f288d01a6344..3ac636285fb1 100644
--- a/trunk/net/mac80211/event.c
+++ b/trunk/net/mac80211/event.c
@@ -7,8 +7,7 @@
  *
  * mac80211 - events
  */
-
-#include <net/iw_handler.h>
+#include <net/cfg80211.h>
 #include "ieee80211_i.h"
 
 /*
@@ -19,21 +18,6 @@
 void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,
 				     struct ieee80211_hdr *hdr, const u8 *tsc)
 {
-	union iwreq_data wrqu;
-	char *buf = kmalloc(128, GFP_ATOMIC);
-
-	if (buf) {
-		/* TODO: needed parameters: count, key type, TSC */
-		sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
-			"keyid=%d %scast addr=%pM)",
-			keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
-			hdr->addr2);
-		memset(&wrqu, 0, sizeof(wrqu));
-		wrqu.data.length = strlen(buf);
-		wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);
-		kfree(buf);
-	}
-
 	cfg80211_michael_mic_failure(sdata->dev, hdr->addr2,
 				     (hdr->addr1[0] & 0x01) ?
 				     NL80211_KEYTYPE_GROUP :
diff --git a/trunk/net/wireless/mlme.c b/trunk/net/wireless/mlme.c
index 42184361a109..e56bbea10fc8 100644
--- a/trunk/net/wireless/mlme.c
+++ b/trunk/net/wireless/mlme.c
@@ -77,6 +77,22 @@ void cfg80211_michael_mic_failure(struct net_device *dev, const u8 *addr,
 {
 	struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;
 	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+#ifdef CONFIG_WIRELESS_EXT
+	union iwreq_data wrqu;
+	char *buf = kmalloc(128, GFP_ATOMIC);
+
+	if (buf) {
+		sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
+			"keyid=%d %scast addr=%pM)", key_id,
+			key_type == NL80211_KEYTYPE_GROUP ? "broad" : "uni",
+			addr);
+		memset(&wrqu, 0, sizeof(wrqu));
+		wrqu.data.length = strlen(buf);
+		wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
+		kfree(buf);
+	}
+#endif
+
 	nl80211_michael_mic_failure(rdev, dev, addr, key_type, key_id, tsc);
 }
 EXPORT_SYMBOL(cfg80211_michael_mic_failure);