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);
 }