From 5d981b113a65075dad180a418b4fd5604a326851 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 1 Oct 2008 15:45:02 -0400
Subject: [PATCH] --- yaml --- r: 112059 b: refs/heads/master c:
 ad788b5e079484aa1d48aa90a3ebd7d954d2e7db h: refs/heads/master i:   112057:
 badb66063a82f8140ab2066fe1ac3210a88c30a3   112055:
 647609bd02fc6843328a3a3e85eb8b3e5e5abe99 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3fd538b78eb1..4dd332f96d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eedda3670ea8e6d7649e3c8847759b0a6e532f8d
+refs/heads/master: ad788b5e079484aa1d48aa90a3ebd7d954d2e7db
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index edc339d649c4..49f86fa56bff 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -690,9 +690,11 @@ static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata,
 		}
 	}
 
-	memset(&wrqu, 0, sizeof(wrqu));
-	wrqu.data.length = len;
-	wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
+	if (len <= IW_CUSTOM_MAX) {
+		memset(&wrqu, 0, sizeof(wrqu));
+		wrqu.data.length = len;
+		wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);
+	}
 
 	kfree(buf);
 }