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

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

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 885b0d43 b2864fbd
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -2843,6 +2843,7 @@ static int __net_init udp_sysctl_init(struct net *net)

static struct pernet_operations __net_initdata udp_sysctl_ops = {
	.init	= udp_sysctl_init,
	.async	= true,
};

void __init udp_init(void)
+1 −0
Original line number Diff line number Diff line
@@ -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,
};