diff options
Diffstat (limited to 'net/tipc/net.c')
-rw-r--r-- | net/tipc/net.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 074891ad4f09..f7c8223ddf7d 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
@@ -116,7 +116,7 @@ | |||
116 | */ | 116 | */ |
117 | 117 | ||
118 | rwlock_t tipc_net_lock = RW_LOCK_UNLOCKED; | 118 | rwlock_t tipc_net_lock = RW_LOCK_UNLOCKED; |
119 | struct network tipc_net = { 0 }; | 119 | struct network tipc_net = { NULL }; |
120 | 120 | ||
121 | struct node *tipc_net_select_remote_node(u32 addr, u32 ref) | 121 | struct node *tipc_net_select_remote_node(u32 addr, u32 ref) |
122 | { | 122 | { |
@@ -128,13 +128,14 @@ u32 tipc_net_select_router(u32 addr, u32 ref) | |||
128 | return tipc_zone_select_router(tipc_net.zones[tipc_zone(addr)], addr, ref); | 128 | return tipc_zone_select_router(tipc_net.zones[tipc_zone(addr)], addr, ref); |
129 | } | 129 | } |
130 | 130 | ||
131 | 131 | #if 0 | |
132 | u32 tipc_net_next_node(u32 a) | 132 | u32 tipc_net_next_node(u32 a) |
133 | { | 133 | { |
134 | if (tipc_net.zones[tipc_zone(a)]) | 134 | if (tipc_net.zones[tipc_zone(a)]) |
135 | return tipc_zone_next_node(a); | 135 | return tipc_zone_next_node(a); |
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | #endif | ||
138 | 139 | ||
139 | void tipc_net_remove_as_router(u32 router) | 140 | void tipc_net_remove_as_router(u32 router) |
140 | { | 141 | { |
@@ -181,7 +182,7 @@ static void net_stop(void) | |||
181 | tipc_zone_delete(tipc_net.zones[z_num]); | 182 | tipc_zone_delete(tipc_net.zones[z_num]); |
182 | } | 183 | } |
183 | kfree(tipc_net.zones); | 184 | kfree(tipc_net.zones); |
184 | tipc_net.zones = 0; | 185 | tipc_net.zones = NULL; |
185 | } | 186 | } |
186 | 187 | ||
187 | static void net_route_named_msg(struct sk_buff *buf) | 188 | static void net_route_named_msg(struct sk_buff *buf) |