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/ipv4.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/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index dad7bc4878e0..b195c4feaa0a 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -996,7 +996,7 @@ static struct inet_protosw dccp_v4_protosw = { | |||
996 | .flags = INET_PROTOSW_ICSK, | 996 | .flags = INET_PROTOSW_ICSK, |
997 | }; | 997 | }; |
998 | 998 | ||
999 | static int dccp_v4_init_net(struct net *net) | 999 | static int __net_init dccp_v4_init_net(struct net *net) |
1000 | { | 1000 | { |
1001 | int err; | 1001 | int err; |
1002 | 1002 | ||
@@ -1005,7 +1005,7 @@ static int dccp_v4_init_net(struct net *net) | |||
1005 | return err; | 1005 | return err; |
1006 | } | 1006 | } |
1007 | 1007 | ||
1008 | static void dccp_v4_exit_net(struct net *net) | 1008 | static void __net_exit dccp_v4_exit_net(struct net *net) |
1009 | { | 1009 | { |
1010 | inet_ctl_sock_destroy(net->dccp.v4_ctl_sk); | 1010 | inet_ctl_sock_destroy(net->dccp.v4_ctl_sk); |
1011 | } | 1011 | } |