diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-01-16 22:35:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-17 22:16:02 -0500 |
commit | 2c8c1e7297e19bdef3c178c3ea41d898a7716e3e (patch) | |
tree | 4d336562e8d5379732a0646e17b0bb1750111ef6 /net/dccp/ipv6.c | |
parent | 72659ecce68588b74f6c46862c2b4cec137d7a5a (diff) |
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/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index baf05cf43c28..1aec6349e858 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -1189,7 +1189,7 @@ static struct inet_protosw dccp_v6_protosw = { | |||
1189 | .flags = INET_PROTOSW_ICSK, | 1189 | .flags = INET_PROTOSW_ICSK, |
1190 | }; | 1190 | }; |
1191 | 1191 | ||
1192 | static int dccp_v6_init_net(struct net *net) | 1192 | static int __net_init dccp_v6_init_net(struct net *net) |
1193 | { | 1193 | { |
1194 | int err; | 1194 | int err; |
1195 | 1195 | ||
@@ -1198,7 +1198,7 @@ static int dccp_v6_init_net(struct net *net) | |||
1198 | return err; | 1198 | return err; |
1199 | } | 1199 | } |
1200 | 1200 | ||
1201 | static void dccp_v6_exit_net(struct net *net) | 1201 | static void __net_exit dccp_v6_exit_net(struct net *net) |
1202 | { | 1202 | { |
1203 | inet_ctl_sock_destroy(net->dccp.v6_ctl_sk); | 1203 | inet_ctl_sock_destroy(net->dccp.v6_ctl_sk); |
1204 | } | 1204 | } |