summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 10:58:43 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 10:58:43 +0100
commitcbeaceead3416d4522ef1e97977469e0633f1eea (patch)
tree51cd9ae2facf4601c49f08ff561538d4fb120b1a
parent0bd2dd6f87f802af37bf037aa084ec4bd9280fae (diff)
Use static LIST_HEAD() for ip_set_type_list
Avoid the need for explicit initialization during runtime (Patrick McHardy's review)
-rw-r--r--kernel/ip_set_core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/ip_set_core.c b/kernel/ip_set_core.c
index ebd37fa..e38c43e 100644
--- a/kernel/ip_set_core.c
+++ b/kernel/ip_set_core.c
@@ -23,7 +23,7 @@
#include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/ipset/ip_set.h>
-static struct list_head ip_set_type_list; /* all registered set types */
+static LIST_HEAD(ip_set_type_list); /* all registered set types */
static DEFINE_MUTEX(ip_set_type_mutex); /* protects ip_set_type_list */
static struct ip_set **ip_set_list; /* all individual sets */
@@ -1521,8 +1521,6 @@ ip_set_init(void)
return -ENOMEM;
}
- INIT_LIST_HEAD(&ip_set_type_list);
-
ret = nfnetlink_subsys_register(&ip_set_netlink_subsys);
if (ret != 0) {
pr_err("ip_set: cannot register with nfnetlink.");