]> granicus.if.org Git - ipset/commitdiff
netfilter: ipset: move registration message to init from net_init
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 16 Feb 2014 10:18:52 +0000 (11:18 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Sun, 16 Feb 2014 10:18:52 +0000 (11:18 +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>
kernel/net/netfilter/ipset/ip_set_core.c

index 020d7c8bd1027ae1737a986872c5c3a20cfa9abc..f67350b65ede9f33ad5db11e5b2592bdcbc4d438 100644 (file)
@@ -1981,7 +1981,6 @@ ip_set_net_init(struct net *net)
 #endif
        inst->is_deleted = 0;
        rcu_assign_pointer(inst->ip_set_list, list);
-       pr_notice("ip_set: protocol %u\n", IPSET_PROTOCOL);
        return 0;
 
 #ifndef HAVE_NET_OPS_ID
@@ -2047,6 +2046,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;
 }