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/ipv4/ip_fragment.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/ipv4/ip_fragment.c')
-rw-r--r-- | net/ipv4/ip_fragment.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 86964b353c31..891c72aea520 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
@@ -646,7 +646,7 @@ static struct ctl_table ip4_frags_ctl_table[] = { | |||
646 | { } | 646 | { } |
647 | }; | 647 | }; |
648 | 648 | ||
649 | static int ip4_frags_ns_ctl_register(struct net *net) | 649 | static int __net_init ip4_frags_ns_ctl_register(struct net *net) |
650 | { | 650 | { |
651 | struct ctl_table *table; | 651 | struct ctl_table *table; |
652 | struct ctl_table_header *hdr; | 652 | struct ctl_table_header *hdr; |
@@ -676,7 +676,7 @@ err_alloc: | |||
676 | return -ENOMEM; | 676 | return -ENOMEM; |
677 | } | 677 | } |
678 | 678 | ||
679 | static void ip4_frags_ns_ctl_unregister(struct net *net) | 679 | static void __net_exit ip4_frags_ns_ctl_unregister(struct net *net) |
680 | { | 680 | { |
681 | struct ctl_table *table; | 681 | struct ctl_table *table; |
682 | 682 | ||
@@ -704,7 +704,7 @@ static inline void ip4_frags_ctl_register(void) | |||
704 | } | 704 | } |
705 | #endif | 705 | #endif |
706 | 706 | ||
707 | static int ipv4_frags_init_net(struct net *net) | 707 | static int __net_init ipv4_frags_init_net(struct net *net) |
708 | { | 708 | { |
709 | /* | 709 | /* |
710 | * Fragment cache limits. We will commit 256K at one time. Should we | 710 | * Fragment cache limits. We will commit 256K at one time. Should we |
@@ -726,7 +726,7 @@ static int ipv4_frags_init_net(struct net *net) | |||
726 | return ip4_frags_ns_ctl_register(net); | 726 | return ip4_frags_ns_ctl_register(net); |
727 | } | 727 | } |
728 | 728 | ||
729 | static void ipv4_frags_exit_net(struct net *net) | 729 | static void __net_exit ipv4_frags_exit_net(struct net *net) |
730 | { | 730 | { |
731 | ip4_frags_ns_ctl_unregister(net); | 731 | ip4_frags_ns_ctl_unregister(net); |
732 | inet_frags_exit_net(&net->ipv4.frags, &ip4_frags); | 732 | inet_frags_exit_net(&net->ipv4.frags, &ip4_frags); |