diff options
| author | Ilia Mirkin | 2014-03-05 07:55:10 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik | 2014-03-06 09:31:43 +0100 |
| commit | 6843bc3c568128e8771ba35cfefe95b7ec1c93a8 (patch) | |
| tree | 12beb53e1bfcf57682af3edd550712fcefa3e762 /net/netfilter/ipset/ip_set_core.c | |
| parent | netfilter: ipset: kernel: uapi: fix MARKMASK attr ABI breakage (diff) | |
| download | kernel-qcow2-linux-6843bc3c568128e8771ba35cfefe95b7ec1c93a8.tar.gz kernel-qcow2-linux-6843bc3c568128e8771ba35cfefe95b7ec1c93a8.tar.xz kernel-qcow2-linux-6843bc3c568128e8771ba35cfefe95b7ec1c93a8.zip | |
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 'net/netfilter/ipset/ip_set_core.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index c6c97b8b31ac..636cb8df5354 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -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; } |