diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-23 18:00:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-23 18:00:47 +0100 |
| commit | f145749dd49d00430e1e735656c757a3552dcd4e (patch) | |
| tree | 8629dc9dffc4723d373c19bcff33ca2a70c3f5db | |
| parent | mlxsw: spectrum_span: Fix initialization of struct mlxsw_sp_span_parms (diff) | |
| parent | net: Convert rxrpc_net_ops (diff) | |
| download | linux-f145749dd49d00430e1e735656c757a3552dcd4e.tar.xz linux-f145749dd49d00430e1e735656c757a3552dcd4e.zip | |
Merge branch 'pernet-convert-part11'
Kirill Tkhai says:
====================
Converting pernet_operations (part #11)
this series continues to review and to convert pernet_operations
to make them possible to be executed in parallel for several
net namespaces at the same time.
I thought last series was last, but there is one
new pernet_operations came to kernel. This is
udp_sysctl_ops, and here we convert it.
Also, David Howells acked rxrpc_net_ops, so I resend
the patch in case of it should be queued by patchwork:
https://www.spinics.net/lists/netdev/msg490678.html
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/udp.c | 3 | ||||
| -rw-r--r-- | net/rxrpc/net_ns.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 908fc02fb4f8..c6dc019bc64b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2842,7 +2842,8 @@ static int __net_init udp_sysctl_init(struct net *net) } static struct pernet_operations __net_initdata udp_sysctl_ops = { - .init = udp_sysctl_init, + .init = udp_sysctl_init, + .async = true, }; void __init udp_init(void) diff --git a/net/rxrpc/net_ns.c b/net/rxrpc/net_ns.c index f18c9248e0d4..5fd939dabf41 100644 --- a/net/rxrpc/net_ns.c +++ b/net/rxrpc/net_ns.c @@ -106,4 +106,5 @@ struct pernet_operations rxrpc_net_ops = { .exit = rxrpc_exit_net, .id = &rxrpc_net_id, .size = sizeof(struct rxrpc_net), + .async = true, }; |