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/xfrm | |
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/xfrm')
-rw-r--r-- | net/xfrm/xfrm_sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c index 2e221f2cad7e..2c4d6cdcba49 100644 --- a/net/xfrm/xfrm_sysctl.c +++ b/net/xfrm/xfrm_sysctl.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <net/net_namespace.h> | 2 | #include <net/net_namespace.h> |
3 | #include <net/xfrm.h> | 3 | #include <net/xfrm.h> |
4 | 4 | ||
5 | static void __xfrm_sysctl_init(struct net *net) | 5 | static void __net_init __xfrm_sysctl_init(struct net *net) |
6 | { | 6 | { |
7 | net->xfrm.sysctl_aevent_etime = XFRM_AE_ETIME; | 7 | net->xfrm.sysctl_aevent_etime = XFRM_AE_ETIME; |
8 | net->xfrm.sysctl_aevent_rseqth = XFRM_AE_SEQT_SIZE; | 8 | net->xfrm.sysctl_aevent_rseqth = XFRM_AE_SEQT_SIZE; |
@@ -64,7 +64,7 @@ out_kmemdup: | |||
64 | return -ENOMEM; | 64 | return -ENOMEM; |
65 | } | 65 | } |
66 | 66 | ||
67 | void xfrm_sysctl_fini(struct net *net) | 67 | void __net_exit xfrm_sysctl_fini(struct net *net) |
68 | { | 68 | { |
69 | struct ctl_table *table; | 69 | struct ctl_table *table; |
70 | 70 | ||