diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-17 03:35:32 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-17 19:16:02 -0800 |
commit | 2c8c1e7297e19bdef3c178c3ea41d898a7716e3e (patch) | |
tree | 4d336562e8d5379732a0646e17b0bb1750111ef6 /net/ipv4/ip_gre.c | |
parent | 72659ecce68588b74f6c46862c2b4cec137d7a5a (diff) | |
download | linux-3.10-2c8c1e7297e19bdef3c178c3ea41d898a7716e3e.tar.gz linux-3.10-2c8c1e7297e19bdef3c178c3ea41d898a7716e3e.tar.bz2 linux-3.10-2c8c1e7297e19bdef3c178c3ea41d898a7716e3e.zip |
net: spread __net_init, __net_exit
__net_init/__net_exit are apparently not going away, so use them
to full extent.
In some cases __net_init was removed, because it was called from
__net_exit code.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r-- | net/ipv4/ip_gre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index f36ce156cac..7631b20490f 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -1307,7 +1307,7 @@ static void ipgre_destroy_tunnels(struct ipgre_net *ign, struct list_head *head) } } -static int ipgre_init_net(struct net *net) +static int __net_init ipgre_init_net(struct net *net) { struct ipgre_net *ign = net_generic(net, ipgre_net_id); int err; @@ -1334,7 +1334,7 @@ err_alloc_dev: return err; } -static void ipgre_exit_net(struct net *net) +static void __net_exit ipgre_exit_net(struct net *net) { struct ipgre_net *ign; LIST_HEAD(list); |