[NETLINK]: Use module_init() in netlink_dev.c

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 30de192de7a9587bb54ab52393ea9ebf12f9087b..d1df1ff56ed8940623c68cf7107cab8c2d2277d8 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -108,7 +108,6 @@ struct netlink_skb_parms
 extern int netlink_attach(int unit, int (*function)(int,struct sk_buff *skb));
 extern void netlink_detach(int unit);
 extern int netlink_post(int unit, struct sk_buff *skb);
-extern int init_netlink(void);
 extern struct sock *netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len));
 extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
 extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock);

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 166e23a5d3fb81bcce24f40a1e74affb22a23254..0474f80ea9beb9516f16d808d2c6cb2ec56c0dee 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1070,9 +1070,6 @@ static int __init netlink_proto_init(void)
 #endif
        /* The netlink device handler may be needed early. */ 
        rtnetlink_init();
-#ifdef CONFIG_NETLINK_DEV
-       init_netlink();
-#endif
        return 0;
 }
 

diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c
index c38bdcb138d03883d445abd5759678492d4cd8ed..813e6431d83aa98ba364f89f45aae10db470f533 100644 (file)
--- a/net/netlink/netlink_dev.c
+++ b/net/netlink/netlink_dev.c
@@ -220,7 +220,7 @@ static struct {
        },
 };
 
-int __init init_netlink(void)
+static int __init init_netlink(void)
 {
        int i;
 
@@ -245,17 +245,7 @@ int __init init_netlink(void)
        return 0;
 }
 
-#ifdef MODULE
-
-MODULE_LICENSE("GPL");
-
-int init_module(void)
-{
-       printk(KERN_INFO "Network Kernel/User communications module 0.04\n");
-       return init_netlink();
-}
-
-void cleanup_module(void)
+static void __exit cleanup_netlink(void)
 {
        int i;
 
@@ -267,4 +257,6 @@ void cleanup_module(void)
        unregister_chrdev(NETLINK_MAJOR, "netlink");
 }
 
-#endif
+MODULE_LICENSE("GPL");
+module_init(init_netlink);
+module_exit(cleanup_netlink);