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

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

Merge branch 'convert-pernet_operations-part4' 



Kirill Tkhai says:

====================
Converting pernet_operations (part #4)

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. The patches touch mostly netfilter,
also there are small number of changes in other places.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 190f887c c29babb7

net/bridge/netfilter/ebtable_broute.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static void __net_exit broute_net_exit(struct net *net) 
static struct pernet_operations broute_net_ops = {

	.init = broute_net_init,

	.exit = broute_net_exit,

	.async = true,

};



static int __init ebtable_broute_init(void)

net/bridge/netfilter/ebtable_filter.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static void __net_exit frame_filter_net_exit(struct net *net) 
static struct pernet_operations frame_filter_net_ops = {

	.init = frame_filter_net_init,

	.exit = frame_filter_net_exit,

	.async = true,

};



static int __init ebtable_filter_init(void)

net/bridge/netfilter/ebtable_nat.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static void __net_exit frame_nat_net_exit(struct net *net) 
static struct pernet_operations frame_nat_net_ops = {

	.init = frame_nat_net_init,

	.exit = frame_nat_net_exit,

	.async = true,

};



static int __init ebtable_nat_init(void)

net/bridge/netfilter/nf_log_bridge.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static void __net_exit nf_log_bridge_net_exit(struct net *net) 
static struct pernet_operations nf_log_bridge_net_ops = {

	.init = nf_log_bridge_net_init,

	.exit = nf_log_bridge_net_exit,

	.async = true,

};



static int __init nf_log_bridge_init(void)

net/caif/caif_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static struct pernet_operations caif_net_ops = { 
	.exit = caif_exit_net,

	.id   = &caif_net_id,

	.size = sizeof(struct caif_net),

	.async = true,

};



/* Initialize Caif devices list */