From e67b3e24e94d0d9a94dbf0d131902efdbde2e753 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 25 Jul 2009 16:54:36 +0200
Subject: [PATCH] --- yaml --- r: 159276 b: refs/heads/master c:
 c0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index abeeb06114da..c0a0a47ce03e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbdec9758736c30ecbb03651b0c2915c442a5895
+refs/heads/master: c0b2bbd833a5a26b5a9425cb9a7eb66bbe736dd1
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 283f1a890dad..c951eb2b07d5 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -3385,6 +3385,8 @@ static int nl80211_crypto_settings(struct genl_info *info,
 				   struct cfg80211_crypto_settings *settings,
 				   int cipher_limit)
 {
+	memset(settings, 0, sizeof(*settings));
+
 	settings->control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
 
 	if (info->attrs[NL80211_ATTR_CIPHER_SUITES_PAIRWISE]) {