diff options
-rw-r--r-- | include/net/tipc/tipc_bearer.h | 9 | ||||
-rw-r--r-- | net/tipc/core.c | 8 | ||||
-rw-r--r-- | net/tipc/core.h | 6 |
3 files changed, 15 insertions, 8 deletions
diff --git a/include/net/tipc/tipc_bearer.h b/include/net/tipc/tipc_bearer.h index 2151a80cdf30..ee2f304e4919 100644 --- a/include/net/tipc/tipc_bearer.h +++ b/include/net/tipc/tipc_bearer.h | |||
@@ -99,6 +99,9 @@ struct tipc_bearer { | |||
99 | char name[TIPC_MAX_BEARER_NAME]; | 99 | char name[TIPC_MAX_BEARER_NAME]; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | /* | ||
103 | * TIPC routines available to supported media types | ||
104 | */ | ||
102 | 105 | ||
103 | int tipc_register_media(u32 media_type, | 106 | int tipc_register_media(u32 media_type, |
104 | char *media_name, | 107 | char *media_name, |
@@ -123,6 +126,12 @@ void tipc_continue(struct tipc_bearer *tb_ptr); | |||
123 | int tipc_enable_bearer(const char *bearer_name, u32 bcast_scope, u32 priority); | 126 | int tipc_enable_bearer(const char *bearer_name, u32 bcast_scope, u32 priority); |
124 | int tipc_disable_bearer(const char *name); | 127 | int tipc_disable_bearer(const char *name); |
125 | 128 | ||
129 | /* | ||
130 | * Routines made available to TIPC by supported media types | ||
131 | */ | ||
132 | |||
133 | int tipc_eth_media_start(void); | ||
134 | void tipc_eth_media_stop(void); | ||
126 | 135 | ||
127 | #endif | 136 | #endif |
128 | 137 | ||
diff --git a/net/tipc/core.c b/net/tipc/core.c index 9a5eb97684a2..b41b0ac67c0b 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -48,14 +48,6 @@ | |||
48 | #include "subscr.h" | 48 | #include "subscr.h" |
49 | #include "config.h" | 49 | #include "config.h" |
50 | 50 | ||
51 | int tipc_eth_media_start(void); | ||
52 | void tipc_eth_media_stop(void); | ||
53 | int tipc_handler_start(void); | ||
54 | void tipc_handler_stop(void); | ||
55 | int tipc_socket_init(void); | ||
56 | void tipc_socket_stop(void); | ||
57 | int tipc_netlink_start(void); | ||
58 | void tipc_netlink_stop(void); | ||
59 | 51 | ||
60 | #define TIPC_MOD_VER "1.6.2" | 52 | #define TIPC_MOD_VER "1.6.2" |
61 | 53 | ||
diff --git a/net/tipc/core.h b/net/tipc/core.h index feabca580820..3fe9b70331d9 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -180,6 +180,12 @@ extern int tipc_core_start(void); | |||
180 | extern void tipc_core_stop(void); | 180 | extern void tipc_core_stop(void); |
181 | extern int tipc_core_start_net(void); | 181 | extern int tipc_core_start_net(void); |
182 | extern void tipc_core_stop_net(void); | 182 | extern void tipc_core_stop_net(void); |
183 | extern int tipc_handler_start(void); | ||
184 | extern void tipc_handler_stop(void); | ||
185 | extern int tipc_netlink_start(void); | ||
186 | extern void tipc_netlink_stop(void); | ||
187 | extern int tipc_socket_init(void); | ||
188 | extern void tipc_socket_stop(void); | ||
183 | 189 | ||
184 | static inline int delimit(int val, int min, int max) | 190 | static inline int delimit(int val, int min, int max) |
185 | { | 191 | { |