diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-13 11:24:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-13 11:24:57 -0400 |
| commit | 74b8da705caff32d599474b3c49fd6a5c65fe03e (patch) | |
| tree | 8c2ff5997de05c8a6389393489f0d474e8497f6c | |
| parent | d98985dd6c2dc69e2ad5f5482a5237fb9487ed99 (diff) | |
| parent | c939a5e4d597d635dee4eab2f27308d50fa606f7 (diff) | |
Merge branch 'pernet-convert-part6'
Kirill Tkhai says:
====================
Converting pernet_operations (part #6)
this series continues to review and to convert pernet_operations
to make them possible to be executed in parallel for several
net namespaces in the same time. There are sctp, tipc and rds
in this series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/rds/tcp.c | 1 | ||||
| -rw-r--r-- | net/sctp/protocol.c | 2 | ||||
| -rw-r--r-- | net/tipc/core.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 08230a145042..eb04e7fa2467 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -515,6 +515,7 @@ static struct pernet_operations rds_tcp_net_ops = { .exit = rds_tcp_exit_net, .id = &rds_tcp_netid, .size = sizeof(struct rds_tcp_net), + .async = true, }; static void rds_tcp_kill_sock(struct net *net) diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 91813e686c67..606361ee9e4a 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -1330,6 +1330,7 @@ static void __net_exit sctp_defaults_exit(struct net *net) static struct pernet_operations sctp_defaults_ops = { .init = sctp_defaults_init, .exit = sctp_defaults_exit, + .async = true, }; static int __net_init sctp_ctrlsock_init(struct net *net) @@ -1353,6 +1354,7 @@ static void __net_init sctp_ctrlsock_exit(struct net *net) static struct pernet_operations sctp_ctrlsock_ops = { .init = sctp_ctrlsock_init, .exit = sctp_ctrlsock_exit, + .async = true, }; /* Initialize the universe into something sensible. */ diff --git a/net/tipc/core.c b/net/tipc/core.c index 0b982d048fb9..04fd91bb11d7 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -105,6 +105,7 @@ static struct pernet_operations tipc_net_ops = { .exit = tipc_exit_net, .id = &tipc_net_id, .size = sizeof(struct tipc_net), + .async = true, }; static int __init tipc_init(void) |