aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/name_distr.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:08:16 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 15:08:16 -0800
commit097916ecafd3bbedbde3ba068522093bf72319b3 (patch)
tree95b8f52826883ccb04086725f0b94186adc1566f /net/tipc/name_distr.h
parent3da38566dfd4b2402b280cb52ffc7c56f1a95b9c (diff)
parent29f8f63272bd286549d1c7f75ad22686191d35d8 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/tipc/name_distr.h')
-rw-r--r--net/tipc/name_distr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/name_distr.h b/net/tipc/name_distr.h
index a04bdeac84e..843da0172f4 100644
--- a/net/tipc/name_distr.h
+++ b/net/tipc/name_distr.h
@@ -39,10 +39,10 @@
#include "name_table.h"
-void named_publish(struct publication *publ);
-void named_withdraw(struct publication *publ);
-void named_node_up(unsigned long node);
-void named_recv(struct sk_buff *buf);
-void named_reinit(void);
+void tipc_named_publish(struct publication *publ);
+void tipc_named_withdraw(struct publication *publ);
+void tipc_named_node_up(unsigned long node);
+void tipc_named_recv(struct sk_buff *buf);
+void tipc_named_reinit(void);
#endif