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

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

Merge branch 'pernet_ops-conversions-part-2' 



Kirill Tkhai says:

====================
Converting pernet_operations (part #2)

This patchset continues to review and to convert pernet_operations
to async. There are mostly ipv6, also some regular used netfilter
pernet_operations are involved. One more converted is cfg80211_pernet_ops.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3021efb4 da349fad

net/ipv4/netfilter/ip_tables.c

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

	.init = ip_tables_net_init,

	.exit = ip_tables_net_exit,

	.async = true,

};



static int __init ip_tables_init(void)

net/ipv4/netfilter/iptable_filter.c

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

	.init = iptable_filter_net_init,

	.exit = iptable_filter_net_exit,

	.async = true,

};



static int __init iptable_filter_init(void)

net/ipv6/addrconf.c

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

	.init = if6_proc_net_init,

	.exit = if6_proc_net_exit,

	.async = true,

};



int __init if6_proc_init(void)

net/ipv6/addrlabel.c

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

	.init = ip6addrlbl_net_init,

	.exit = ip6addrlbl_net_exit,

	.async = true,

};



int __init ipv6_addr_label_init(void)

net/ipv6/af_inet6.c

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

	.init = inet6_net_init,

	.exit = inet6_net_exit,

	.async = true,

};



static const struct ipv6_stub ipv6_stub_impl = {