Merge ../linux-2.6

1 files changed, 6 insertions, 6 deletions

diff --git a/net/tipc/zone.c b/net/tipc/zone.c
index 7c11f7f83a21..2803e1b4f170 100644
--- a/net/tipc/zone.c
+++ b/net/tipc/zone.c
@@ -44,11 +44,11 @@
 
 struct _zone *tipc_zone_create(u32 addr)
 {
-        struct _zone *z_ptr = 0;
+        struct _zone *z_ptr = NULL;
         u32 z_num;
 
         if (!tipc_addr_domain_valid(addr))
-                return 0;
+                return NULL;
 
         z_ptr = (struct _zone *)kmalloc(sizeof(*z_ptr), GFP_ATOMIC);
         if (z_ptr != NULL) {
@@ -114,10 +114,10 @@ struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref
         u32 c_num;
 
         if (!z_ptr)
-                return 0;
+                return NULL;
         c_ptr = z_ptr->clusters[tipc_cluster(addr)];
         if (!c_ptr)
-                return 0;
+                return NULL;
         n_ptr = tipc_cltr_select_node(c_ptr, ref);
         if (n_ptr)
                 return n_ptr;
@@ -126,12 +126,12 @@ struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref
         for (c_num = 1; c_num <= tipc_max_clusters; c_num++) {
                 c_ptr = z_ptr->clusters[c_num];
                 if (!c_ptr)
-                        return 0;
+                        return NULL;
                 n_ptr = tipc_cltr_select_node(c_ptr, ref);
                 if (n_ptr)
                         return n_ptr;
         }
-        return 0;
+        return NULL;
 }
 
 u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref)