[PATCH] W1: w1_netlink: New init/fini netlink callbacks.

They are guarded with NETLINK_DISABLE compile time options,
so if CONFIG_NET is disabled, no linking errors occur.
Bug noticed by Adrian Bunk <bunk@stusta.de>.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Evgeniy Polyakov
2005-07-27 13:10:11 +04:00
committed by Greg Kroah-Hartman
parent 1b11d78cf8
commit 2d8331792e
3 changed files with 34 additions and 10 deletions
+26
View File
@@ -57,10 +57,36 @@ void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
nlmsg_failure:
return;
}
int dev_init_netlink(struct w1_master *dev)
{
dev->nls = netlink_kernel_create(NETLINK_W1, 1, NULL, THIS_MODULE);
if (!dev->nls) {
printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n",
NETLINK_W1, dev->dev.bus_id);
}
return 0;
}
void dev_fini_netlink(struct w1_master *dev)
{
if (dev->nls && dev->nls->sk_socket)
sock_release(dev->nls->sk_socket);
}
#else
#warning Netlink support is disabled. Please compile with NET support enabled.
void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
{
}
int dev_init_netlink(struct w1_master *dev)
{
return 0;
}
void dev_fini_netlink(struct w1_master *dev)
{
}
#endif