aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-03-05 01:55:10 -0500
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2014-03-06 03:31:43 -0500
commit6843bc3c568128e8771ba35cfefe95b7ec1c93a8 (patch)
tree12beb53e1bfcf57682af3edd550712fcefa3e762
parent004088768b78f69002f03a341597217eb608fb2c (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>
-rw-r--r--net/netfilter/ipset/ip_set_core.c2
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)
1945 return -ENOMEM; 1945 return -ENOMEM;
1946 inst->is_deleted = 0; 1946 inst->is_deleted = 0;
1947 rcu_assign_pointer(inst->ip_set_list, list); 1947 rcu_assign_pointer(inst->ip_set_list, list);
1948 pr_notice("ip_set: protocol %u\n", IPSET_PROTOCOL);
1949 return 0; 1948 return 0;
1950} 1949}
1951 1950
@@ -1996,6 +1995,7 @@ ip_set_init(void)
1996 nfnetlink_subsys_unregister(&ip_set_netlink_subsys); 1995 nfnetlink_subsys_unregister(&ip_set_netlink_subsys);
1997 return ret; 1996 return ret;
1998 } 1997 }
1998 pr_info("ip_set: protocol %u\n", IPSET_PROTOCOL);
1999 return 0; 1999 return 0;
2000} 2000}
2001 2001