diff options
Diffstat (limited to 'net/tipc/cluster.c')
-rw-r--r-- | net/tipc/cluster.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c index 405be87157ba..996b2b67687e 100644 --- a/net/tipc/cluster.c +++ b/net/tipc/cluster.c | |||
@@ -47,7 +47,6 @@ u32 tipc_highest_allowed_slave = 0; | |||
47 | 47 | ||
48 | struct cluster *tipc_cltr_create(u32 addr) | 48 | struct cluster *tipc_cltr_create(u32 addr) |
49 | { | 49 | { |
50 | struct _zone *z_ptr; | ||
51 | struct cluster *c_ptr; | 50 | struct cluster *c_ptr; |
52 | int max_nodes; | 51 | int max_nodes; |
53 | 52 | ||
@@ -75,18 +74,7 @@ struct cluster *tipc_cltr_create(u32 addr) | |||
75 | c_ptr->highest_slave = LOWEST_SLAVE - 1; | 74 | c_ptr->highest_slave = LOWEST_SLAVE - 1; |
76 | c_ptr->highest_node = 0; | 75 | c_ptr->highest_node = 0; |
77 | 76 | ||
78 | z_ptr = tipc_zone_find(tipc_zone(addr)); | 77 | tipc_net.clusters[1] = c_ptr; |
79 | if (!z_ptr) { | ||
80 | z_ptr = tipc_zone_create(addr); | ||
81 | } | ||
82 | if (!z_ptr) { | ||
83 | kfree(c_ptr->nodes); | ||
84 | kfree(c_ptr); | ||
85 | return NULL; | ||
86 | } | ||
87 | |||
88 | tipc_zone_attach_cluster(z_ptr, c_ptr); | ||
89 | c_ptr->owner = z_ptr; | ||
90 | return c_ptr; | 78 | return c_ptr; |
91 | } | 79 | } |
92 | 80 | ||