[PATCH 2/3] ipv6: icmp: use icmpv6_sk_exit()

[Kefeng Wang]

Simply use icmpv6_sk_exit() when inet_ctl_sock_create() fail
in icmpv6_sk_init().

Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
---
 net/ipv6/icmp.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index bbcdfd299692..af520014def5 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -953,10 +953,19 @@ void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6,
        security_sk_classify_flow(sk, flowi6_to_flowi(fl6));
 }
 
+static void __net_exit icmpv6_sk_exit(struct net *net)
+{
+       int i;
+
+       for_each_possible_cpu(i)
+               inet_ctl_sock_destroy(net->ipv6.icmp_sk[i]);
+       kfree(net->ipv6.icmp_sk);
+}
+
 static int __net_init icmpv6_sk_init(struct net *net)
 {
        struct sock *sk;
-       int err, i, j;
+       int err, i;
 
        net->ipv6.icmp_sk =
                kcalloc(nr_cpu_ids, sizeof(struct sock *), GFP_KERNEL);
@@ -982,22 +991,10 @@ static int __net_init icmpv6_sk_init(struct net *net)
        return 0;
 
  fail:
-       for (j = 0; j < i; j++)
-               inet_ctl_sock_destroy(net->ipv6.icmp_sk[j]);
-       kfree(net->ipv6.icmp_sk);
+       icmpv6_sk_exit(net);
        return err;
 }
 
-static void __net_exit icmpv6_sk_exit(struct net *net)
-{
-       int i;
-
-       for_each_possible_cpu(i) {
-               inet_ctl_sock_destroy(net->ipv6.icmp_sk[i]);
-       }
-       kfree(net->ipv6.icmp_sk);
-}
-
 static struct pernet_operations icmpv6_sk_ops = {
        .init = icmpv6_sk_init,
        .exit = icmpv6_sk_exit,
-- 
2.20.1