6 files changed, 20 insertions, 37 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 937ad32db77c..6d6fb74f3b52 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3593,10 +3593,8 @@ void __exit addrconf_cleanup(void)
         rtnl_unlock();
 
 #ifdef CONFIG_IPV6_PRIVACY
-        if (likely(md5_tfm != NULL)) {
-                crypto_free_tfm(md5_tfm);
-                md5_tfm = NULL;
-        }
+        crypto_free_tfm(md5_tfm);
+        md5_tfm = NULL;
 #endif
 
 #ifdef CONFIG_PROC_FS
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 0ebfad907a03..f3629730eb15 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -401,10 +401,8 @@ static int ah6_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;
@@ -417,14 +415,10 @@ static void ah6_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);
 }
 
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index e8bff9d3d96c..9b27460f0cc7 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -276,22 +276,14 @@ static void esp6_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);
 }
 
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 5176fc655ea9..fa8f1bb0aa52 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -549,7 +549,7 @@ static void icmpv6_notify(struct sk_buff *skb, int type, int code, u32 info)
         read_lock(&raw_v6_lock);
         if ((sk = sk_head(&raw_v6_htable[hash])) != NULL) {
                 while((sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr,
-                                            skb->dev->ifindex))) {
+                                            IP6CB(skb)->iif))) {
                         rawv6_err(sk, skb, NULL, type, code, inner_offset, info);
                         sk = sk_next(sk);
                 }
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 135383ef538f..85bfbc69b2c3 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -341,8 +341,7 @@ static void ipcomp6_free_tfms(struct crypto_tfm **tfms)
 
         for_each_cpu(cpu) {
                 struct crypto_tfm *tfm = *per_cpu_ptr(tfms, cpu);
-                if (tfm)
-                        crypto_free_tfm(tfm);
+                crypto_free_tfm(tfm);
         }
         free_percpu(tfms);
 }
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 7a5863298f3f..ed3a76b30fd9 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -166,7 +166,7 @@ int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
         if (sk == NULL)
                 goto out;
 
-        sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, skb->dev->ifindex);
+        sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, IP6CB(skb)->iif);
 
         while (sk) {
                 delivered = 1;
@@ -178,7 +178,7 @@ int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
                                 rawv6_rcv(sk, clone);
                 }
                 sk = __raw_v6_lookup(sk_next(sk), nexthdr, daddr, saddr,
-                                     skb->dev->ifindex);
+                                     IP6CB(skb)->iif);
         }
 out:
         read_unlock(&raw_v6_lock);