From ea3583cab886041e3fa5def049cef588de06da73 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 6 Mar 2008 15:06:06 -0800
Subject: [PATCH] --- yaml --- r: 90045 b: refs/heads/master c:
 0e0609bbd2ab39a5964a70b409a5567ebbaf3700 h: refs/heads/master i:   90043:
 f2e5751c7d7dbf581204912948a6bc1d93561c83 v: v3

---
 [refs]                               | 2 +-
 trunk/include/net/tipc/tipc_bearer.h | 9 +++++++++
 trunk/net/tipc/core.c                | 8 --------
 trunk/net/tipc/core.h                | 6 ++++++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 1f8de200e9bb..b34d719d3fc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e247a8f5d018740220c66bd5df1928d21d277d63
+refs/heads/master: 0e0609bbd2ab39a5964a70b409a5567ebbaf3700
diff --git a/trunk/include/net/tipc/tipc_bearer.h b/trunk/include/net/tipc/tipc_bearer.h
index 2151a80cdf30..ee2f304e4919 100644
--- a/trunk/include/net/tipc/tipc_bearer.h
+++ b/trunk/include/net/tipc/tipc_bearer.h
@@ -99,6 +99,9 @@ struct tipc_bearer {
 	char name[TIPC_MAX_BEARER_NAME];
 };
 
+/*
+ * TIPC routines available to supported media types
+ */
 
 int  tipc_register_media(u32 media_type,
 			 char *media_name, 
@@ -123,6 +126,12 @@ void tipc_continue(struct tipc_bearer *tb_ptr);
 int tipc_enable_bearer(const char *bearer_name, u32 bcast_scope, u32 priority);
 int tipc_disable_bearer(const char *name);
 
+/*
+ * Routines made available to TIPC by supported media types
+ */
+
+int  tipc_eth_media_start(void);
+void tipc_eth_media_stop(void);
 
 #endif
 
diff --git a/trunk/net/tipc/core.c b/trunk/net/tipc/core.c
index 9a5eb97684a2..b41b0ac67c0b 100644
--- a/trunk/net/tipc/core.c
+++ b/trunk/net/tipc/core.c
@@ -48,14 +48,6 @@
 #include "subscr.h"
 #include "config.h"
 
-int  tipc_eth_media_start(void);
-void tipc_eth_media_stop(void);
-int  tipc_handler_start(void);
-void tipc_handler_stop(void);
-int  tipc_socket_init(void);
-void tipc_socket_stop(void);
-int  tipc_netlink_start(void);
-void tipc_netlink_stop(void);
 
 #define TIPC_MOD_VER "1.6.2"
 
diff --git a/trunk/net/tipc/core.h b/trunk/net/tipc/core.h
index feabca580820..3fe9b70331d9 100644
--- a/trunk/net/tipc/core.h
+++ b/trunk/net/tipc/core.h
@@ -180,6 +180,12 @@ extern int  tipc_core_start(void);
 extern void tipc_core_stop(void);
 extern int  tipc_core_start_net(void);
 extern void tipc_core_stop_net(void);
+extern int  tipc_handler_start(void);
+extern void tipc_handler_stop(void);
+extern int  tipc_netlink_start(void);
+extern void tipc_netlink_stop(void);
+extern int  tipc_socket_init(void);
+extern void tipc_socket_stop(void);
 
 static inline int delimit(int val, int min, int max)
 {