git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
w1
/
w1_netlink.c
diff --git
a/drivers/w1/w1_netlink.c
b/drivers/w1/w1_netlink.c
index
df9d3e7
..
2a82fb0
100644
(file)
--- a/
drivers/w1/w1_netlink.c
+++ b/
drivers/w1/w1_netlink.c
@@
-26,6
+26,7
@@
#include "w1_log.h"
#include "w1_netlink.h"
#include "w1_log.h"
#include "w1_netlink.h"
+#ifndef NETLINK_DISABLED
void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
{
unsigned int size;
void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
{
unsigned int size;
@@
-33,6
+34,9
@@
void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
struct w1_netlink_msg *data;
struct nlmsghdr *nlh;
struct w1_netlink_msg *data;
struct nlmsghdr *nlh;
+ if (!dev->nls)
+ return;
+
size = NLMSG_SPACE(sizeof(struct w1_netlink_msg));
skb = alloc_skb(size, GFP_ATOMIC);
size = NLMSG_SPACE(sizeof(struct w1_netlink_msg));
skb = alloc_skb(size, GFP_ATOMIC);
@@
-53,3
+57,10
@@
void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)
nlmsg_failure:
return;
}
nlmsg_failure:
return;
}
+#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)
+{
+}
+#endif