diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-02-16 11:18:52 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-02-16 11:18:52 +0100 |
| commit | e22eb1d87eccd49d8d8e7022e39c40d48c900952 (patch) | |
| tree | 38132a4a5cdb1cc96cf77230af5a9ce62aedaece /kernel/net | |
| parent | f3dc2bd75a9e8f4c0e3ff77ffb517d51d70723f6 (diff) | |
netfilter: ipset: move registration message to init from net_init
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>
Diffstat (limited to 'kernel/net')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index 020d7c8..f67350b 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -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; } |