diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /net/netlink | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 10 | ||||
| -rw-r--r-- | net/netlink/netlink_dev.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index be011a234..3927d9c3a 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/kernel.h> +#include <linux/init.h> #include <linux/major.h> #include <linux/signal.h> #include <linux/sched.h> @@ -968,16 +969,19 @@ struct net_proto_family netlink_family_ops = { netlink_create }; -void netlink_proto_init(struct net_proto *pro) +static int __init netlink_proto_init(void) { struct sk_buff *dummy_skb; if (sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb)) { - printk(KERN_CRIT "netlink_proto_init: panic\n"); - return; + printk(KERN_CRIT "netlink_init: panic\n"); + return -1; } sock_register(&netlink_family_ops); #ifdef CONFIG_PROC_FS create_proc_read_entry("net/netlink", 0, 0, netlink_read_proc, NULL); #endif + return 0; } + +module_init(netlink_proto_init); diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c index bc1b378fc..da7598a79 100644 --- a/net/netlink/netlink_dev.c +++ b/net/netlink/netlink_dev.c @@ -31,7 +31,7 @@ #include <asm/system.h> #include <asm/uaccess.h> -static unsigned open_map = 0; +static unsigned open_map; static struct socket *netlink_user[MAX_LINKS]; /* @@ -178,7 +178,7 @@ static struct file_operations netlink_fops = { release: netlink_release, }; -static devfs_handle_t devfs_handle = NULL; +static devfs_handle_t devfs_handle; static void __init make_devfs_entries (const char *name, int minor) { |