Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / net / tipc / net.c

diff --git a/net/tipc/net.c b/net/tipc/net.c
index cd0328601bba24d00952358762bf7d5a2b74928d..e5a359ab49308025f10a1c065cfffa23e7991a5f 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -115,7 +115,7 @@
  *     - A local spin_lock protecting the queue of subscriber events.
 */
 
-rwlock_t tipc_net_lock = RW_LOCK_UNLOCKED;
+DEFINE_RWLOCK(tipc_net_lock);
 struct network tipc_net = { NULL };
 
 struct node *tipc_net_select_remote_node(u32 addr, u32 ref) 
@@ -128,13 +128,14 @@ u32 tipc_net_select_router(u32 addr, u32 ref)
        return tipc_zone_select_router(tipc_net.zones[tipc_zone(addr)], addr, ref);
 }
 
-
+#if 0
 u32 tipc_net_next_node(u32 a)
 {
        if (tipc_net.zones[tipc_zone(a)])
                return tipc_zone_next_node(a);
        return 0;
 }
+#endif
 
 void tipc_net_remove_as_router(u32 router)
 {