diff options
Diffstat (limited to 'drivers/w1/w1_netlink.c')
-rw-r--r-- | drivers/w1/w1_netlink.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c index 06d614af1166..b63109ada5a7 100644 --- a/drivers/w1/w1_netlink.c +++ b/drivers/w1/w1_netlink.c | |||
@@ -45,7 +45,7 @@ void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg) | |||
45 | 45 | ||
46 | memcpy(w, msg, sizeof(struct w1_netlink_msg)); | 46 | memcpy(w, msg, sizeof(struct w1_netlink_msg)); |
47 | 47 | ||
48 | cn_netlink_send(m, 0, GFP_KERNEL); | 48 | cn_netlink_send(m, 0, 0, GFP_KERNEL); |
49 | } | 49 | } |
50 | 50 | ||
51 | static void w1_send_slave(struct w1_master *dev, u64 rn) | 51 | static void w1_send_slave(struct w1_master *dev, u64 rn) |
@@ -60,7 +60,7 @@ static void w1_send_slave(struct w1_master *dev, u64 rn) | |||
60 | 60 | ||
61 | if (avail < 8) { | 61 | if (avail < 8) { |
62 | msg->ack++; | 62 | msg->ack++; |
63 | cn_netlink_send(msg, 0, GFP_KERNEL); | 63 | cn_netlink_send(msg, 0, 0, GFP_KERNEL); |
64 | 64 | ||
65 | msg->len = sizeof(struct w1_netlink_msg) + | 65 | msg->len = sizeof(struct w1_netlink_msg) + |
66 | sizeof(struct w1_netlink_cmd); | 66 | sizeof(struct w1_netlink_cmd); |
@@ -131,7 +131,7 @@ static int w1_get_slaves(struct w1_master *dev, | |||
131 | } | 131 | } |
132 | 132 | ||
133 | msg->ack = 0; | 133 | msg->ack = 0; |
134 | cn_netlink_send(msg, 0, GFP_KERNEL); | 134 | cn_netlink_send(msg, 0, 0, GFP_KERNEL); |
135 | 135 | ||
136 | dev->priv = NULL; | 136 | dev->priv = NULL; |
137 | dev->priv_size = 0; | 137 | dev->priv_size = 0; |
@@ -173,7 +173,7 @@ static int w1_send_read_reply(struct cn_msg *msg, struct w1_netlink_msg *hdr, | |||
173 | 173 | ||
174 | memcpy(c->data, cmd->data, c->len); | 174 | memcpy(c->data, cmd->data, c->len); |
175 | 175 | ||
176 | err = cn_netlink_send(cm, 0, GFP_KERNEL); | 176 | err = cn_netlink_send(cm, 0, 0, GFP_KERNEL); |
177 | 177 | ||
178 | kfree(data); | 178 | kfree(data); |
179 | 179 | ||
@@ -316,7 +316,7 @@ static int w1_process_command_root(struct cn_msg *msg, struct w1_netlink_msg *mc | |||
316 | mutex_lock(&w1_mlock); | 316 | mutex_lock(&w1_mlock); |
317 | list_for_each_entry(m, &w1_masters, w1_master_entry) { | 317 | list_for_each_entry(m, &w1_masters, w1_master_entry) { |
318 | if (cn->len + sizeof(*id) > PAGE_SIZE - sizeof(struct cn_msg)) { | 318 | if (cn->len + sizeof(*id) > PAGE_SIZE - sizeof(struct cn_msg)) { |
319 | cn_netlink_send(cn, 0, GFP_KERNEL); | 319 | cn_netlink_send(cn, 0, 0, GFP_KERNEL); |
320 | cn->ack++; | 320 | cn->ack++; |
321 | cn->len = sizeof(struct w1_netlink_msg); | 321 | cn->len = sizeof(struct w1_netlink_msg); |
322 | w->len = 0; | 322 | w->len = 0; |
@@ -329,7 +329,7 @@ static int w1_process_command_root(struct cn_msg *msg, struct w1_netlink_msg *mc | |||
329 | id++; | 329 | id++; |
330 | } | 330 | } |
331 | cn->ack = 0; | 331 | cn->ack = 0; |
332 | cn_netlink_send(cn, 0, GFP_KERNEL); | 332 | cn_netlink_send(cn, 0, 0, GFP_KERNEL); |
333 | mutex_unlock(&w1_mlock); | 333 | mutex_unlock(&w1_mlock); |
334 | 334 | ||
335 | kfree(cn); | 335 | kfree(cn); |
@@ -364,7 +364,7 @@ static int w1_netlink_send_error(struct cn_msg *rcmsg, struct w1_netlink_msg *rm | |||
364 | cmsg->len += sizeof(*cmd); | 364 | cmsg->len += sizeof(*cmd); |
365 | } | 365 | } |
366 | 366 | ||
367 | error = cn_netlink_send(cmsg, 0, GFP_KERNEL); | 367 | error = cn_netlink_send(cmsg, 0, 0, GFP_KERNEL); |
368 | kfree(cmsg); | 368 | kfree(cmsg); |
369 | 369 | ||
370 | return error; | 370 | return error; |