diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /net/tipc/cluster.c | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'net/tipc/cluster.c')
| -rw-r--r-- | net/tipc/cluster.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c index 4bb3404f610b..46ee6c58532d 100644 --- a/net/tipc/cluster.c +++ b/net/tipc/cluster.c | |||
| @@ -238,7 +238,7 @@ static struct sk_buff *tipc_cltr_prepare_routing_msg(u32 data_size, u32 dest) | |||
| 238 | if (buf) { | 238 | if (buf) { |
| 239 | msg = buf_msg(buf); | 239 | msg = buf_msg(buf); |
| 240 | memset((char *)msg, 0, size); | 240 | memset((char *)msg, 0, size); |
| 241 | msg_init(msg, ROUTE_DISTRIBUTOR, 0, TIPC_OK, INT_H_SIZE, dest); | 241 | msg_init(msg, ROUTE_DISTRIBUTOR, 0, INT_H_SIZE, dest); |
| 242 | } | 242 | } |
| 243 | return buf; | 243 | return buf; |
| 244 | } | 244 | } |
| @@ -571,6 +571,6 @@ exit: | |||
| 571 | int tipc_cltr_init(void) | 571 | int tipc_cltr_init(void) |
| 572 | { | 572 | { |
| 573 | tipc_highest_allowed_slave = LOWEST_SLAVE + tipc_max_slaves; | 573 | tipc_highest_allowed_slave = LOWEST_SLAVE + tipc_max_slaves; |
| 574 | return tipc_cltr_create(tipc_own_addr) ? TIPC_OK : -ENOMEM; | 574 | return tipc_cltr_create(tipc_own_addr) ? 0 : -ENOMEM; |
| 575 | } | 575 | } |
| 576 | 576 | ||