diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:25:21 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:20:15 -0500 |
commit | c43072852649d8382b81237ce51195bcec36f24a (patch) | |
tree | 5e55d65bd4d1db35418d2990310bd2c765d60405 /net/tipc/core.h | |
parent | cca5172a7ec10dfdb0b787cd8e9d5b0b8f179793 (diff) |
[NET] TIPC: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.h')
-rw-r--r-- | net/tipc/core.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 4638947c232..e40ada964d6 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * net/tipc/core.h: Include file for TIPC global declarations | 2 | * net/tipc/core.h: Include file for TIPC global declarations |
3 | * | 3 | * |
4 | * Copyright (c) 2005-2006, Ericsson AB | 4 | * Copyright (c) 2005-2006, Ericsson AB |
5 | * Copyright (c) 2005-2006, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
@@ -54,7 +54,7 @@ | |||
54 | #include <asm/atomic.h> | 54 | #include <asm/atomic.h> |
55 | #include <asm/hardirq.h> | 55 | #include <asm/hardirq.h> |
56 | #include <linux/netdevice.h> | 56 | #include <linux/netdevice.h> |
57 | #include <linux/in.h> | 57 | #include <linux/in.h> |
58 | #include <linux/list.h> | 58 | #include <linux/list.h> |
59 | #include <linux/vmalloc.h> | 59 | #include <linux/vmalloc.h> |
60 | 60 | ||
@@ -88,7 +88,7 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
88 | #define dump(fmt, arg...) do {if (DBG_OUTPUT != TIPC_NULL) tipc_dump(DBG_OUTPUT, fmt, ##arg);} while(0) | 88 | #define dump(fmt, arg...) do {if (DBG_OUTPUT != TIPC_NULL) tipc_dump(DBG_OUTPUT, fmt, ##arg);} while(0) |
89 | 89 | ||
90 | 90 | ||
91 | /* | 91 | /* |
92 | * By default, TIPC_OUTPUT is defined to be system console and TIPC log buffer, | 92 | * By default, TIPC_OUTPUT is defined to be system console and TIPC log buffer, |
93 | * while DBG_OUTPUT is the null print buffer. These defaults can be changed | 93 | * while DBG_OUTPUT is the null print buffer. These defaults can be changed |
94 | * here, or on a per .c file basis, by redefining these symbols. The following | 94 | * here, or on a per .c file basis, by redefining these symbols. The following |
@@ -126,9 +126,9 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
126 | #define dump(fmt,arg...) do {} while (0) | 126 | #define dump(fmt,arg...) do {} while (0) |
127 | 127 | ||
128 | 128 | ||
129 | /* | 129 | /* |
130 | * TIPC_OUTPUT is defined to be the system console, while DBG_OUTPUT is | 130 | * TIPC_OUTPUT is defined to be the system console, while DBG_OUTPUT is |
131 | * the null print buffer. Thes ensures that any system or debug messages | 131 | * the null print buffer. Thes ensures that any system or debug messages |
132 | * that are generated without using the above macros are handled correctly. | 132 | * that are generated without using the above macros are handled correctly. |
133 | */ | 133 | */ |
134 | 134 | ||
@@ -138,10 +138,10 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
138 | #undef DBG_OUTPUT | 138 | #undef DBG_OUTPUT |
139 | #define DBG_OUTPUT TIPC_NULL | 139 | #define DBG_OUTPUT TIPC_NULL |
140 | 140 | ||
141 | #endif | 141 | #endif |
142 | 142 | ||
143 | 143 | ||
144 | /* | 144 | /* |
145 | * TIPC-specific error codes | 145 | * TIPC-specific error codes |
146 | */ | 146 | */ |
147 | 147 | ||
@@ -204,11 +204,11 @@ u32 tipc_k_signal(Handler routine, unsigned long argument); | |||
204 | * @timer: pointer to timer structure | 204 | * @timer: pointer to timer structure |
205 | * @routine: pointer to routine to invoke when timer expires | 205 | * @routine: pointer to routine to invoke when timer expires |
206 | * @argument: value to pass to routine when timer expires | 206 | * @argument: value to pass to routine when timer expires |
207 | * | 207 | * |
208 | * Timer must be initialized before use (and terminated when no longer needed). | 208 | * Timer must be initialized before use (and terminated when no longer needed). |
209 | */ | 209 | */ |
210 | 210 | ||
211 | static inline void k_init_timer(struct timer_list *timer, Handler routine, | 211 | static inline void k_init_timer(struct timer_list *timer, Handler routine, |
212 | unsigned long argument) | 212 | unsigned long argument) |
213 | { | 213 | { |
214 | dbg("initializing timer %p\n", timer); | 214 | dbg("initializing timer %p\n", timer); |
@@ -221,13 +221,13 @@ static inline void k_init_timer(struct timer_list *timer, Handler routine, | |||
221 | * k_start_timer - start a timer | 221 | * k_start_timer - start a timer |
222 | * @timer: pointer to timer structure | 222 | * @timer: pointer to timer structure |
223 | * @msec: time to delay (in ms) | 223 | * @msec: time to delay (in ms) |
224 | * | 224 | * |
225 | * Schedules a previously initialized timer for later execution. | 225 | * Schedules a previously initialized timer for later execution. |
226 | * If timer is already running, the new timeout overrides the previous request. | 226 | * If timer is already running, the new timeout overrides the previous request. |
227 | * | 227 | * |
228 | * To ensure the timer doesn't expire before the specified delay elapses, | 228 | * To ensure the timer doesn't expire before the specified delay elapses, |
229 | * the amount of delay is rounded up when converting to the jiffies | 229 | * the amount of delay is rounded up when converting to the jiffies |
230 | * then an additional jiffy is added to account for the fact that | 230 | * then an additional jiffy is added to account for the fact that |
231 | * the starting time may be in the middle of the current jiffy. | 231 | * the starting time may be in the middle of the current jiffy. |
232 | */ | 232 | */ |
233 | 233 | ||
@@ -240,10 +240,10 @@ static inline void k_start_timer(struct timer_list *timer, unsigned long msec) | |||
240 | /** | 240 | /** |
241 | * k_cancel_timer - cancel a timer | 241 | * k_cancel_timer - cancel a timer |
242 | * @timer: pointer to timer structure | 242 | * @timer: pointer to timer structure |
243 | * | 243 | * |
244 | * Cancels a previously initialized timer. | 244 | * Cancels a previously initialized timer. |
245 | * Can be called safely even if the timer is already inactive. | 245 | * Can be called safely even if the timer is already inactive. |
246 | * | 246 | * |
247 | * WARNING: Must not be called when holding locks required by the timer's | 247 | * WARNING: Must not be called when holding locks required by the timer's |
248 | * timeout routine, otherwise deadlock can occur on SMP systems! | 248 | * timeout routine, otherwise deadlock can occur on SMP systems! |
249 | */ | 249 | */ |
@@ -257,11 +257,11 @@ static inline void k_cancel_timer(struct timer_list *timer) | |||
257 | /** | 257 | /** |
258 | * k_term_timer - terminate a timer | 258 | * k_term_timer - terminate a timer |
259 | * @timer: pointer to timer structure | 259 | * @timer: pointer to timer structure |
260 | * | 260 | * |
261 | * Prevents further use of a previously initialized timer. | 261 | * Prevents further use of a previously initialized timer. |
262 | * | 262 | * |
263 | * WARNING: Caller must ensure timer isn't currently running. | 263 | * WARNING: Caller must ensure timer isn't currently running. |
264 | * | 264 | * |
265 | * (Do not "enhance" this routine to automatically cancel an active timer, | 265 | * (Do not "enhance" this routine to automatically cancel an active timer, |
266 | * otherwise deadlock can arise when a timeout routine calls k_term_timer.) | 266 | * otherwise deadlock can arise when a timeout routine calls k_term_timer.) |
267 | */ | 267 | */ |
@@ -302,7 +302,7 @@ static inline struct tipc_msg *buf_msg(struct sk_buff *skb) | |||
302 | * @size: message size (including TIPC header) | 302 | * @size: message size (including TIPC header) |
303 | * | 303 | * |
304 | * Returns a new buffer with data pointers set to the specified size. | 304 | * Returns a new buffer with data pointers set to the specified size. |
305 | * | 305 | * |
306 | * NOTE: Headroom is reserved to allow prepending of a data link header. | 306 | * NOTE: Headroom is reserved to allow prepending of a data link header. |
307 | * There may also be unrequested tailroom present at the buffer's end. | 307 | * There may also be unrequested tailroom present at the buffer's end. |
308 | */ | 308 | */ |
@@ -334,4 +334,4 @@ static inline void buf_discard(struct sk_buff *skb) | |||
334 | kfree_skb(skb); | 334 | kfree_skb(skb); |
335 | } | 335 | } |
336 | 336 | ||
337 | #endif | 337 | #endif |