From af2336a45c5fb8a90e3694bf16023cb4f6d79932 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 19 Jan 2006 16:22:07 +0800
Subject: [PATCH] --- yaml --- r: 21157 b: refs/heads/master c:
 8aa914b747b650fc1735f3a3171753ac15ed93ab h: refs/heads/master i:   21155:
 439686878ed92fec9132e7000bd064d8e890a207 v: v3

---
 [refs]                                     | 2 +-
 trunk/net/ieee80211/ieee80211_crypt_tkip.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c6c46d065af8..40a9f291d5d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bd64366044565d6861783613db191c8aaec691e
+refs/heads/master: 8aa914b747b650fc1735f3a3171753ac15ed93ab
diff --git a/trunk/net/ieee80211/ieee80211_crypt_tkip.c b/trunk/net/ieee80211/ieee80211_crypt_tkip.c
index e0988320efbf..de56a47edb00 100644
--- a/trunk/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/trunk/net/ieee80211/ieee80211_crypt_tkip.c
@@ -80,10 +80,9 @@ static void *ieee80211_tkip_init(int key_idx)
 {
 	struct ieee80211_tkip_data *priv;
 
-	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
 	if (priv == NULL)
 		goto fail;
-	memset(priv, 0, sizeof(*priv));
 
 	priv->key_idx = key_idx;