Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 8 insertions, 16 deletions

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index b31ffc5053d2..1b5a09d1b90b 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -343,22 +343,14 @@ static void esp_destroy(struct xfrm_state *x)
         if (!esp)
                 return;
 
-        if (esp->conf.tfm) {
-                crypto_free_tfm(esp->conf.tfm);
-                esp->conf.tfm = NULL;
-        }
-        if (esp->conf.ivec) {
-                kfree(esp->conf.ivec);
-                esp->conf.ivec = NULL;
-        }
-        if (esp->auth.tfm) {
-                crypto_free_tfm(esp->auth.tfm);
-                esp->auth.tfm = NULL;
-        }
-        if (esp->auth.work_icv) {
-                kfree(esp->auth.work_icv);
-                esp->auth.work_icv = NULL;
-        }
+        crypto_free_tfm(esp->conf.tfm);
+        esp->conf.tfm = NULL;
+        kfree(esp->conf.ivec);
+        esp->conf.ivec = NULL;
+        crypto_free_tfm(esp->auth.tfm);
+        esp->auth.tfm = NULL;
+        kfree(esp->auth.work_icv);
+        esp->auth.work_icv = NULL;
         kfree(esp);
 }