Skip to content

Commit

Permalink
Merge branch 'pernet-convert-part11'
Browse files Browse the repository at this point in the history
Kirill Tkhai says:

====================
Converting pernet_operations (part FireflyTeam#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 <[email protected]>
  • Loading branch information
davem330 committed Mar 23, 2018
2 parents 885b0d4 + b2864fb commit f145749
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/ipv4/udp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions net/rxrpc/net_ns.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

0 comments on commit f145749

Please sign in to comment.