summaryrefslogtreecommitdiffstats
path: root/kernel/net/netfilter
diff options
context:
space:
mode:
authorKirill Tkhai <ktkhai@virtuozzo.com>2018-10-22 20:46:53 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2018-10-22 20:46:53 +0200
commita192069c576cd7d4b7174f26af27950b0a95d269 (patch)
tree617f138e84ea9abfe23b70098676da07200e6902 /kernel/net/netfilter
parent0f82228387ae12a4188ba352ea53487ee2556fa5 (diff)
net: Convert ip_set_net_ops
These pernet_operations initialize and destroy net_generic(net, ip_set_net_id)-related data. Since ip_set is under CONFIG_IP_SET, it's easy to watch drivers, which depend on this config. All of them are in net/netfilter/ipset directory, except of net/netfilter/xt_set.c. There are no more drivers, which use ip_set, and all of the above don't register another pernet_operations. Also, there are is no indirect users, as header file include/linux/netfilter/ipset/ip_set.h does not define indirect users by something like this: #ifdef CONFIG_IP_SET extern func(void); #else static inline func(void); #endif So, there are no more pernet operations, dereferencing net_generic(net, ip_set_net_id). ip_set_net_ops are OK to be executed in parallel for several net, so we mark them as async. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'kernel/net/netfilter')
-rw-r--r--kernel/net/netfilter/ipset/ip_set_core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index 9dccdf3..65628ae 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -2159,7 +2159,10 @@ static struct pernet_operations ip_set_net_ops = {
.exit = ip_set_net_exit,
#ifdef HAVE_NET_OPS_ID
.id = &ip_set_net_id,
- .size = sizeof(struct ip_set_net)
+ .size = sizeof(struct ip_set_net),
+#ifdef HAVE_NET_OPS_ASYNC
+ .async = true,
+#endif
#endif
};