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

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

Merge branch 'pernet-convert-part5' 



Kirill Tkhai says:

====================
Converting pernet_operations (part #5)

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 mostly netfilter
operations (and they should be the last netfilter's), also
there are two patches touching pktgen and xfrm.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 459d153d 1fd2c557

net/core/pktgen.c

+1 −0
Original line number Diff line number Diff line
@@ -3851,6 +3851,7 @@ static struct pernet_operations pg_net_ops = { 
	.exit = pg_net_exit,

	.id   = &pg_net_id,

	.size = sizeof(struct pktgen_net),

	.async = true,

};



static int __init pg_init(void)

net/ipv4/netfilter/arptable_filter.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static void __net_exit arptable_filter_net_exit(struct net *net) 


static struct pernet_operations arptable_filter_net_ops = {

	.exit = arptable_filter_net_exit,

	.async = true,

};



static int __init arptable_filter_init(void)

net/ipv4/netfilter/iptable_mangle.c

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static void __net_exit iptable_mangle_net_exit(struct net *net) 


static struct pernet_operations iptable_mangle_net_ops = {

	.exit = iptable_mangle_net_exit,

	.async = true,

};



static int __init iptable_mangle_init(void)

net/ipv4/netfilter/iptable_nat.c

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static void __net_exit iptable_nat_net_exit(struct net *net) 


static struct pernet_operations iptable_nat_net_ops = {

	.exit	= iptable_nat_net_exit,

	.async	= true,

};



static int __init iptable_nat_init(void)

net/ipv4/netfilter/iptable_raw.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static void __net_exit iptable_raw_net_exit(struct net *net) 


static struct pernet_operations iptable_raw_net_ops = {

	.exit = iptable_raw_net_exit,

	.async = true,

};



static int __init iptable_raw_init(void)