Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b8da70 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents d98985dd c939a5e4

net/rds/tcp.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

net/sctp/protocol.c

+2 −0
Original line number Diff line number Diff line
@@ -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.  */

net/tipc/core.c

+1 −0
Original line number Diff line number Diff line
@@ -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)