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/key | |
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/key')
-rw-r--r-- | net/key/af_key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 76fa6fef6473..4744b1f6372f 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -3738,17 +3738,17 @@ static int __net_init pfkey_init_proc(struct net *net) | |||
3738 | return 0; | 3738 | return 0; |
3739 | } | 3739 | } |
3740 | 3740 | ||
3741 | static void pfkey_exit_proc(struct net *net) | 3741 | static void __net_exit pfkey_exit_proc(struct net *net) |
3742 | { | 3742 | { |
3743 | proc_net_remove(net, "pfkey"); | 3743 | proc_net_remove(net, "pfkey"); |
3744 | } | 3744 | } |
3745 | #else | 3745 | #else |
3746 | static int __net_init pfkey_init_proc(struct net *net) | 3746 | static inline int pfkey_init_proc(struct net *net) |
3747 | { | 3747 | { |
3748 | return 0; | 3748 | return 0; |
3749 | } | 3749 | } |
3750 | 3750 | ||
3751 | static void pfkey_exit_proc(struct net *net) | 3751 | static inline void pfkey_exit_proc(struct net *net) |
3752 | { | 3752 | { |
3753 | } | 3753 | } |
3754 | #endif | 3754 | #endif |