Commit c982ccf0 authored by Christoph Hellwig's avatar Christoph Hellwig

[NET]: Make dv_init an initcall.

parent 334cf36a
...@@ -2863,9 +2863,6 @@ int unregister_netdevice(struct net_device *dev) ...@@ -2863,9 +2863,6 @@ int unregister_netdevice(struct net_device *dev)
extern void net_device_init(void); extern void net_device_init(void);
extern void ip_auto_config(void); extern void ip_auto_config(void);
#ifdef CONFIG_NET_DIVERT
extern void dv_init(void);
#endif /* CONFIG_NET_DIVERT */
/* /*
...@@ -2889,10 +2886,6 @@ static int __init net_dev_init(void) ...@@ -2889,10 +2886,6 @@ static int __init net_dev_init(void)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
INIT_LIST_HEAD(&ptype_base[i]); INIT_LIST_HEAD(&ptype_base[i]);
#ifdef CONFIG_NET_DIVERT
dv_init();
#endif /* CONFIG_NET_DIVERT */
/* /*
* Initialise the packet receive queues. * Initialise the packet receive queues.
*/ */
......
...@@ -40,11 +40,12 @@ ...@@ -40,11 +40,12 @@
const char sysctl_divert_version[32]="0.46"; /* Current version */ const char sysctl_divert_version[32]="0.46"; /* Current version */
int __init dv_init(void) static int __init dv_init(void)
{ {
printk(KERN_INFO "NET4: Frame Diverter %s\n", sysctl_divert_version); printk(KERN_INFO "NET4: Frame Diverter %s\n", sysctl_divert_version);
return 0; return 0;
} }
module_init(dv_init);
/* /*
* Allocate a divert_blk for a device. This must be an ethernet nic. * Allocate a divert_blk for a device. This must be an ethernet nic.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment