]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
netfilter: ipset: move registration message to init from net_init
authorIlia Mirkin <imirkin@alum.mit.edu>
Wed, 5 Mar 2014 06:55:10 +0000 (07:55 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 6 Mar 2014 08:31:43 +0000 (09:31 +0100)
Commit 1785e8f473 ("netfiler: ipset: Add net namespace for ipset") moved
the initialization print into net_init, which can get called a lot due
to namespaces. Move it back into init, reduce to pr_info.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
net/netfilter/ipset/ip_set_core.c

index c6c97b8b31acc48cb775a8f28caa1fadea791d0d..636cb8df5354d183266427f92293df50b061a678 100644 (file)
@@ -1945,7 +1945,6 @@ ip_set_net_init(struct net *net)
                return -ENOMEM;
        inst->is_deleted = 0;
        rcu_assign_pointer(inst->ip_set_list, list);
-       pr_notice("ip_set: protocol %u\n", IPSET_PROTOCOL);
        return 0;
 }
 
@@ -1996,6 +1995,7 @@ ip_set_init(void)
                nfnetlink_subsys_unregister(&ip_set_netlink_subsys);
                return ret;
        }
+       pr_info("ip_set: protocol %u\n", IPSET_PROTOCOL);
        return 0;
 }