Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal

[linux-2.6-omap-h63xx.git] / net / tipc / net.h

diff --git a/net/tipc/net.h b/net/tipc/net.h
index a6a0e9976ac9e1de14395165e53ca9750f430219..de2b9ad8f646098921f54613ea7cfe11d2f6e144 100644 (file)
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@@ -55,10 +55,10 @@ extern rwlock_t tipc_net_lock;
 void tipc_net_remove_as_router(u32 router);
 void tipc_net_send_external_routes(u32 dest);
 void tipc_net_route_msg(struct sk_buff *buf);
-struct node *tipc_net_select_remote_node(u32 addr, u32 ref);
+struct tipc_node *tipc_net_select_remote_node(u32 addr, u32 ref);
 u32 tipc_net_select_router(u32 addr, u32 ref);
 
-int tipc_net_start(void);
+int tipc_net_start(u32 addr);
 void tipc_net_stop(void);
 
 #endif