From c6fdced5b078dcfc4b770a8aa1748d129995c564 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 4 Nov 2010 22:59:56 +0100
Subject: [PATCH] --- yaml --- r: 224302 b: refs/heads/master c:
 ffa56e540c3949c4560dcce45eca247819e183c1 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/mac80211/aes_ccm.c  | 3 +--
 trunk/net/mac80211/aes_cmac.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ee9a9a831a6c..8830e9c19907 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 723fc7af5300dba9eac40cb23dbefa67589e5181
+refs/heads/master: ffa56e540c3949c4560dcce45eca247819e183c1
diff --git a/trunk/net/mac80211/aes_ccm.c b/trunk/net/mac80211/aes_ccm.c
index d2b03e0851ef..4bd6ef0be380 100644
--- a/trunk/net/mac80211/aes_ccm.c
+++ b/trunk/net/mac80211/aes_ccm.c
@@ -147,6 +147,5 @@ struct crypto_cipher *ieee80211_aes_key_setup_encrypt(const u8 key[])
 
 void ieee80211_aes_key_free(struct crypto_cipher *tfm)
 {
-	if (tfm)
-		crypto_free_cipher(tfm);
+	crypto_free_cipher(tfm);
 }
diff --git a/trunk/net/mac80211/aes_cmac.c b/trunk/net/mac80211/aes_cmac.c
index b4d66cca76d6..d502b2684a66 100644
--- a/trunk/net/mac80211/aes_cmac.c
+++ b/trunk/net/mac80211/aes_cmac.c
@@ -128,6 +128,5 @@ struct crypto_cipher * ieee80211_aes_cmac_key_setup(const u8 key[])
 
 void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm)
 {
-	if (tfm)
-		crypto_free_cipher(tfm);
+	crypto_free_cipher(tfm);
 }