diff options
Diffstat (limited to 'net/tipc/core.h')
-rw-r--r-- | net/tipc/core.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 13837e0e56b1..2a9bb99537b3 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -85,7 +85,6 @@ void tipc_printf(struct print_buf *, const char *fmt, ...); | |||
85 | /* | 85 | /* |
86 | * TIPC_OUTPUT is the destination print buffer for system messages. | 86 | * TIPC_OUTPUT is the destination print buffer for system messages. |
87 | */ | 87 | */ |
88 | |||
89 | #ifndef TIPC_OUTPUT | 88 | #ifndef TIPC_OUTPUT |
90 | #define TIPC_OUTPUT TIPC_LOG | 89 | #define TIPC_OUTPUT TIPC_LOG |
91 | #endif | 90 | #endif |
@@ -102,7 +101,6 @@ void tipc_printf(struct print_buf *, const char *fmt, ...); | |||
102 | /* | 101 | /* |
103 | * DBG_OUTPUT is the destination print buffer for debug messages. | 102 | * DBG_OUTPUT is the destination print buffer for debug messages. |
104 | */ | 103 | */ |
105 | |||
106 | #ifndef DBG_OUTPUT | 104 | #ifndef DBG_OUTPUT |
107 | #define DBG_OUTPUT TIPC_LOG | 105 | #define DBG_OUTPUT TIPC_LOG |
108 | #endif | 106 | #endif |
@@ -126,13 +124,11 @@ void tipc_msg_dbg(struct print_buf *, struct tipc_msg *, const char *); | |||
126 | /* | 124 | /* |
127 | * TIPC-specific error codes | 125 | * TIPC-specific error codes |
128 | */ | 126 | */ |
129 | |||
130 | #define ELINKCONG EAGAIN /* link congestion <=> resource unavailable */ | 127 | #define ELINKCONG EAGAIN /* link congestion <=> resource unavailable */ |
131 | 128 | ||
132 | /* | 129 | /* |
133 | * Global configuration variables | 130 | * Global configuration variables |
134 | */ | 131 | */ |
135 | |||
136 | extern u32 tipc_own_addr; | 132 | extern u32 tipc_own_addr; |
137 | extern int tipc_max_ports; | 133 | extern int tipc_max_ports; |
138 | extern int tipc_max_subscriptions; | 134 | extern int tipc_max_subscriptions; |
@@ -143,7 +139,6 @@ extern int tipc_remote_management; | |||
143 | /* | 139 | /* |
144 | * Other global variables | 140 | * Other global variables |
145 | */ | 141 | */ |
146 | |||
147 | extern int tipc_random; | 142 | extern int tipc_random; |
148 | extern const char tipc_alphabet[]; | 143 | extern const char tipc_alphabet[]; |
149 | 144 | ||
@@ -151,7 +146,6 @@ extern const char tipc_alphabet[]; | |||
151 | /* | 146 | /* |
152 | * Routines available to privileged subsystems | 147 | * Routines available to privileged subsystems |
153 | */ | 148 | */ |
154 | |||
155 | extern int tipc_core_start_net(unsigned long); | 149 | extern int tipc_core_start_net(unsigned long); |
156 | extern int tipc_handler_start(void); | 150 | extern int tipc_handler_start(void); |
157 | extern void tipc_handler_stop(void); | 151 | extern void tipc_handler_stop(void); |
@@ -163,7 +157,6 @@ extern void tipc_socket_stop(void); | |||
163 | /* | 157 | /* |
164 | * TIPC timer and signal code | 158 | * TIPC timer and signal code |
165 | */ | 159 | */ |
166 | |||
167 | typedef void (*Handler) (unsigned long); | 160 | typedef void (*Handler) (unsigned long); |
168 | 161 | ||
169 | u32 tipc_k_signal(Handler routine, unsigned long argument); | 162 | u32 tipc_k_signal(Handler routine, unsigned long argument); |
@@ -176,7 +169,6 @@ u32 tipc_k_signal(Handler routine, unsigned long argument); | |||
176 | * | 169 | * |
177 | * Timer must be initialized before use (and terminated when no longer needed). | 170 | * Timer must be initialized before use (and terminated when no longer needed). |
178 | */ | 171 | */ |
179 | |||
180 | static inline void k_init_timer(struct timer_list *timer, Handler routine, | 172 | static inline void k_init_timer(struct timer_list *timer, Handler routine, |
181 | unsigned long argument) | 173 | unsigned long argument) |
182 | { | 174 | { |
@@ -196,7 +188,6 @@ static inline void k_init_timer(struct timer_list *timer, Handler routine, | |||
196 | * then an additional jiffy is added to account for the fact that | 188 | * then an additional jiffy is added to account for the fact that |
197 | * the starting time may be in the middle of the current jiffy. | 189 | * the starting time may be in the middle of the current jiffy. |
198 | */ | 190 | */ |
199 | |||
200 | static inline void k_start_timer(struct timer_list *timer, unsigned long msec) | 191 | static inline void k_start_timer(struct timer_list *timer, unsigned long msec) |
201 | { | 192 | { |
202 | mod_timer(timer, jiffies + msecs_to_jiffies(msec) + 1); | 193 | mod_timer(timer, jiffies + msecs_to_jiffies(msec) + 1); |
@@ -212,7 +203,6 @@ static inline void k_start_timer(struct timer_list *timer, unsigned long msec) | |||
212 | * WARNING: Must not be called when holding locks required by the timer's | 203 | * WARNING: Must not be called when holding locks required by the timer's |
213 | * timeout routine, otherwise deadlock can occur on SMP systems! | 204 | * timeout routine, otherwise deadlock can occur on SMP systems! |
214 | */ | 205 | */ |
215 | |||
216 | static inline void k_cancel_timer(struct timer_list *timer) | 206 | static inline void k_cancel_timer(struct timer_list *timer) |
217 | { | 207 | { |
218 | del_timer_sync(timer); | 208 | del_timer_sync(timer); |
@@ -229,12 +219,10 @@ static inline void k_cancel_timer(struct timer_list *timer) | |||
229 | * (Do not "enhance" this routine to automatically cancel an active timer, | 219 | * (Do not "enhance" this routine to automatically cancel an active timer, |
230 | * otherwise deadlock can arise when a timeout routine calls k_term_timer.) | 220 | * otherwise deadlock can arise when a timeout routine calls k_term_timer.) |
231 | */ | 221 | */ |
232 | |||
233 | static inline void k_term_timer(struct timer_list *timer) | 222 | static inline void k_term_timer(struct timer_list *timer) |
234 | { | 223 | { |
235 | } | 224 | } |
236 | 225 | ||
237 | |||
238 | /* | 226 | /* |
239 | * TIPC message buffer code | 227 | * TIPC message buffer code |
240 | * | 228 | * |
@@ -244,7 +232,6 @@ static inline void k_term_timer(struct timer_list *timer) | |||
244 | * Note: Headroom should be a multiple of 4 to ensure the TIPC header fields | 232 | * Note: Headroom should be a multiple of 4 to ensure the TIPC header fields |
245 | * are word aligned for quicker access | 233 | * are word aligned for quicker access |
246 | */ | 234 | */ |
247 | |||
248 | #define BUF_HEADROOM LL_MAX_HEADER | 235 | #define BUF_HEADROOM LL_MAX_HEADER |
249 | 236 | ||
250 | struct tipc_skb_cb { | 237 | struct tipc_skb_cb { |
@@ -253,7 +240,6 @@ struct tipc_skb_cb { | |||
253 | 240 | ||
254 | #define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0])) | 241 | #define TIPC_SKB_CB(__skb) ((struct tipc_skb_cb *)&((__skb)->cb[0])) |
255 | 242 | ||
256 | |||
257 | static inline struct tipc_msg *buf_msg(struct sk_buff *skb) | 243 | static inline struct tipc_msg *buf_msg(struct sk_buff *skb) |
258 | { | 244 | { |
259 | return (struct tipc_msg *)skb->data; | 245 | return (struct tipc_msg *)skb->data; |