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

1 files changed, 6 insertions, 12 deletions

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 514c85b2631a..035ad2c9e1ba 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -263,10 +263,8 @@ static int ah_init_state(struct xfrm_state *x)
 
 error:
         if (ahp) {
-                if (ahp->work_icv)
-                        kfree(ahp->work_icv);
-                if (ahp->tfm)
-                        crypto_free_tfm(ahp->tfm);
+                kfree(ahp->work_icv);
+                crypto_free_tfm(ahp->tfm);
                 kfree(ahp);
         }
         return -EINVAL;
@@ -279,14 +277,10 @@ static void ah_destroy(struct xfrm_state *x)
         if (!ahp)
                 return;
 
-        if (ahp->work_icv) {
-                kfree(ahp->work_icv);
-                ahp->work_icv = NULL;
-        }
-        if (ahp->tfm) {
-                crypto_free_tfm(ahp->tfm);
-                ahp->tfm = NULL;
-        }
+        kfree(ahp->work_icv);
+        ahp->work_icv = NULL;
+        crypto_free_tfm(ahp->tfm);
+        ahp->tfm = NULL;
         kfree(ahp);
 }