aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bearer.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/bearer.h')
-rw-r--r--net/tipc/bearer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index cc780bbedbb9..516af8c0577d 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * net/tipc/bearer.h: Include file for TIPC bearer code 2 * net/tipc/bearer.h: Include file for TIPC bearer code
3 * 3 *
4 * Copyright (c) 1996-2006, Ericsson AB 4 * Copyright (c) 1996-2006, 2013, Ericsson AB
5 * Copyright (c) 2005, 2010-2011, Wind River Systems 5 * Copyright (c) 2005, 2010-2011, Wind River Systems
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
@@ -157,7 +157,6 @@ extern struct tipc_bearer tipc_bearers[];
157/* 157/*
158 * TIPC routines available to supported media types 158 * TIPC routines available to supported media types
159 */ 159 */
160int tipc_register_media(struct tipc_media *m_ptr);
161 160
162void tipc_recv_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr); 161void tipc_recv_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr);
163 162
@@ -171,10 +170,12 @@ int tipc_disable_bearer(const char *name);
171 */ 170 */
172int tipc_eth_media_start(void); 171int tipc_eth_media_start(void);
173void tipc_eth_media_stop(void); 172void tipc_eth_media_stop(void);
173extern struct tipc_media eth_media_info;
174 174
175#ifdef CONFIG_TIPC_MEDIA_IB 175#ifdef CONFIG_TIPC_MEDIA_IB
176int tipc_ib_media_start(void); 176int tipc_ib_media_start(void);
177void tipc_ib_media_stop(void); 177void tipc_ib_media_stop(void);
178extern struct tipc_media ib_media_info;
178#else 179#else
179static inline int tipc_ib_media_start(void) { return 0; } 180static inline int tipc_ib_media_start(void) { return 0; }
180static inline void tipc_ib_media_stop(void) { return; } 181static inline void tipc_ib_media_stop(void) { return; }