diff options
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/w1_int.c | 6 | ||||
-rw-r--r-- | drivers/w1/w1_netlink.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index b5a5e04b6d37..498ad505fa5f 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c | |||
@@ -86,9 +86,9 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, | |||
86 | 86 | ||
87 | dev->driver = driver; | 87 | dev->driver = driver; |
88 | 88 | ||
89 | dev->groups = 23; | 89 | dev->groups = 1; |
90 | dev->seq = 1; | 90 | dev->seq = 1; |
91 | dev->nls = netlink_kernel_create(NETLINK_W1, NULL); | 91 | dev->nls = netlink_kernel_create(NETLINK_W1, 1, NULL, THIS_MODULE); |
92 | if (!dev->nls) { | 92 | if (!dev->nls) { |
93 | printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", | 93 | printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", |
94 | NETLINK_NFLOG, dev->dev.bus_id); | 94 | NETLINK_NFLOG, dev->dev.bus_id); |
@@ -225,3 +225,5 @@ void w1_remove_master_device(struct w1_bus_master *bm) | |||
225 | 225 | ||
226 | EXPORT_SYMBOL(w1_add_master_device); | 226 | EXPORT_SYMBOL(w1_add_master_device); |
227 | EXPORT_SYMBOL(w1_remove_master_device); | 227 | EXPORT_SYMBOL(w1_remove_master_device); |
228 | |||
229 | MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_W1); | ||
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c index 2a82fb055c70..e7b774423dd6 100644 --- a/drivers/w1/w1_netlink.c +++ b/drivers/w1/w1_netlink.c | |||
@@ -51,7 +51,7 @@ void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg) | |||
51 | 51 | ||
52 | memcpy(data, msg, sizeof(struct w1_netlink_msg)); | 52 | memcpy(data, msg, sizeof(struct w1_netlink_msg)); |
53 | 53 | ||
54 | NETLINK_CB(skb).dst_groups = dev->groups; | 54 | NETLINK_CB(skb).dst_group = dev->groups; |
55 | netlink_broadcast(dev->nls, skb, 0, dev->groups, GFP_ATOMIC); | 55 | netlink_broadcast(dev->nls, skb, 0, dev->groups, GFP_ATOMIC); |
56 | 56 | ||
57 | nlmsg_failure: | 57 | nlmsg_failure: |