staging: rt2860: use new hex_to_bin() method

[safe/jmp/linux-2.6] / net / tipc / cluster.c

diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c
index 689fdef..e68f705 100644 (file)
--- 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)
        if (buf) {
                msg = buf_msg(buf);
                memset((char *)msg, 0, size);
-               msg_init(msg, ROUTE_DISTRIBUTOR, 0, INT_H_SIZE, dest);
+               tipc_msg_init(msg, ROUTE_DISTRIBUTOR, 0, INT_H_SIZE, dest);
        }
        return buf;
 }
@@ -437,11 +437,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf)
                break;
        case ROUTE_ADDITION:
                if (!is_slave(tipc_own_addr)) {
-                       assert(!in_own_cluster(c_ptr->addr)
-                              || is_slave(rem_node));
+                       assert(!in_own_cluster(c_ptr->addr) ||
+                              is_slave(rem_node));
                } else {
-                       assert(in_own_cluster(c_ptr->addr)
-                              && !is_slave(rem_node));
+                       assert(in_own_cluster(c_ptr->addr) &&
+                              !is_slave(rem_node));
                }
                n_ptr = c_ptr->nodes[tipc_node(rem_node)];
                if (!n_ptr)
@@ -451,11 +451,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf)
                break;
        case ROUTE_REMOVAL:
                if (!is_slave(tipc_own_addr)) {
-                       assert(!in_own_cluster(c_ptr->addr)
-                              || is_slave(rem_node));
+                       assert(!in_own_cluster(c_ptr->addr) ||
+                              is_slave(rem_node));
                } else {
-                       assert(in_own_cluster(c_ptr->addr)
-                              && !is_slave(rem_node));
+                       assert(in_own_cluster(c_ptr->addr) &&
+                              !is_slave(rem_node));
                }
                n_ptr = c_ptr->nodes[tipc_node(rem_node)];
                if (n_ptr)