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/8021q/vlan.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/8021q/vlan.c')
-rw-r--r-- | net/8021q/vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 33f90e7362cc..453512266ea1 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -663,7 +663,7 @@ out: | |||
663 | return err; | 663 | return err; |
664 | } | 664 | } |
665 | 665 | ||
666 | static int vlan_init_net(struct net *net) | 666 | static int __net_init vlan_init_net(struct net *net) |
667 | { | 667 | { |
668 | struct vlan_net *vn = net_generic(net, vlan_net_id); | 668 | struct vlan_net *vn = net_generic(net, vlan_net_id); |
669 | int err; | 669 | int err; |
@@ -675,7 +675,7 @@ static int vlan_init_net(struct net *net) | |||
675 | return err; | 675 | return err; |
676 | } | 676 | } |
677 | 677 | ||
678 | static void vlan_exit_net(struct net *net) | 678 | static void __net_exit vlan_exit_net(struct net *net) |
679 | { | 679 | { |
680 | vlan_proc_cleanup(net); | 680 | vlan_proc_cleanup(net); |
681 | } | 681 | } |