diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/cluster.c | 2 | ||||
-rw-r--r-- | net/tipc/link.c | 2 | ||||
-rw-r--r-- | net/tipc/ref.c | 2 | ||||
-rw-r--r-- | net/tipc/zone.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c index 95b373913aa0..4bb3404f610b 100644 --- a/net/tipc/cluster.c +++ b/net/tipc/cluster.c | |||
@@ -142,7 +142,7 @@ void tipc_cltr_attach_node(struct cluster *c_ptr, struct node *n_ptr) | |||
142 | max_n_num = tipc_highest_allowed_slave; | 142 | max_n_num = tipc_highest_allowed_slave; |
143 | assert(n_num > 0); | 143 | assert(n_num > 0); |
144 | assert(n_num <= max_n_num); | 144 | assert(n_num <= max_n_num); |
145 | assert(c_ptr->nodes[n_num] == 0); | 145 | assert(c_ptr->nodes[n_num] == NULL); |
146 | c_ptr->nodes[n_num] = n_ptr; | 146 | c_ptr->nodes[n_num] = n_ptr; |
147 | if (n_num > c_ptr->highest_node) | 147 | if (n_num > c_ptr->highest_node) |
148 | c_ptr->highest_node = n_num; | 148 | c_ptr->highest_node = n_num; |
diff --git a/net/tipc/link.c b/net/tipc/link.c index 1b17fecee747..cefa99824c58 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -3251,7 +3251,7 @@ static void link_print(struct link *l_ptr, struct print_buf *buf, | |||
3251 | if ((mod(msg_seqno(buf_msg(l_ptr->last_out)) - | 3251 | if ((mod(msg_seqno(buf_msg(l_ptr->last_out)) - |
3252 | msg_seqno(buf_msg(l_ptr->first_out))) | 3252 | msg_seqno(buf_msg(l_ptr->first_out))) |
3253 | != (l_ptr->out_queue_size - 1)) | 3253 | != (l_ptr->out_queue_size - 1)) |
3254 | || (l_ptr->last_out->next != 0)) { | 3254 | || (l_ptr->last_out->next != NULL)) { |
3255 | tipc_printf(buf, "\nSend queue inconsistency\n"); | 3255 | tipc_printf(buf, "\nSend queue inconsistency\n"); |
3256 | tipc_printf(buf, "first_out= %x ", l_ptr->first_out); | 3256 | tipc_printf(buf, "first_out= %x ", l_ptr->first_out); |
3257 | tipc_printf(buf, "next_out= %x ", l_ptr->next_out); | 3257 | tipc_printf(buf, "next_out= %x ", l_ptr->next_out); |
diff --git a/net/tipc/ref.c b/net/tipc/ref.c index 6704a58c7851..c38744c96ed1 100644 --- a/net/tipc/ref.c +++ b/net/tipc/ref.c | |||
@@ -148,7 +148,7 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock) | |||
148 | reference = (next_plus_upper & ~index_mask) + index; | 148 | reference = (next_plus_upper & ~index_mask) + index; |
149 | entry->data.reference = reference; | 149 | entry->data.reference = reference; |
150 | entry->object = object; | 150 | entry->object = object; |
151 | if (lock != 0) | 151 | if (lock != NULL) |
152 | *lock = &entry->lock; | 152 | *lock = &entry->lock; |
153 | spin_unlock_bh(&entry->lock); | 153 | spin_unlock_bh(&entry->lock); |
154 | } | 154 | } |
diff --git a/net/tipc/zone.c b/net/tipc/zone.c index 114e173f11a5..3506f8563441 100644 --- a/net/tipc/zone.c +++ b/net/tipc/zone.c | |||
@@ -82,7 +82,7 @@ void tipc_zone_attach_cluster(struct _zone *z_ptr, struct cluster *c_ptr) | |||
82 | 82 | ||
83 | assert(c_ptr->addr); | 83 | assert(c_ptr->addr); |
84 | assert(c_num <= tipc_max_clusters); | 84 | assert(c_num <= tipc_max_clusters); |
85 | assert(z_ptr->clusters[c_num] == 0); | 85 | assert(z_ptr->clusters[c_num] == NULL); |
86 | z_ptr->clusters[c_num] = c_ptr; | 86 | z_ptr->clusters[c_num] = c_ptr; |
87 | } | 87 | } |
88 | 88 | ||