diff options
Diffstat (limited to 'net/tipc/core.h')
-rw-r--r-- | net/tipc/core.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 1f2e8b27a13f..86f54f3512f1 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -2,7 +2,7 @@ | |||
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, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
@@ -111,10 +111,6 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
111 | 111 | ||
112 | #else | 112 | #else |
113 | 113 | ||
114 | #ifndef DBG_OUTPUT | ||
115 | #define DBG_OUTPUT NULL | ||
116 | #endif | ||
117 | |||
118 | /* | 114 | /* |
119 | * TIPC debug support not included: | 115 | * TIPC debug support not included: |
120 | * - system messages are printed to system console | 116 | * - system messages are printed to system console |
@@ -129,6 +125,19 @@ void tipc_dump(struct print_buf*,const char *fmt, ...); | |||
129 | #define msg_dbg(msg,txt) do {} while (0) | 125 | #define msg_dbg(msg,txt) do {} while (0) |
130 | #define dump(fmt,arg...) do {} while (0) | 126 | #define dump(fmt,arg...) do {} while (0) |
131 | 127 | ||
128 | |||
129 | /* | ||
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 | ||
132 | * that are generated without using the above macros are handled correctly. | ||
133 | */ | ||
134 | |||
135 | #undef TIPC_OUTPUT | ||
136 | #define TIPC_OUTPUT TIPC_CONS | ||
137 | |||
138 | #undef DBG_OUTPUT | ||
139 | #define DBG_OUTPUT NULL | ||
140 | |||
132 | #endif | 141 | #endif |
133 | 142 | ||
134 | 143 | ||
@@ -309,7 +318,7 @@ static inline struct sk_buff *buf_acquire(u32 size) | |||
309 | * buf_discard - frees a TIPC message buffer | 318 | * buf_discard - frees a TIPC message buffer |
310 | * @skb: message buffer | 319 | * @skb: message buffer |
311 | * | 320 | * |
312 | * Frees a new buffer. If passed NULL, just returns. | 321 | * Frees a message buffer. If passed NULL, just returns. |
313 | */ | 322 | */ |
314 | 323 | ||
315 | static inline void buf_discard(struct sk_buff *skb) | 324 | static inline void buf_discard(struct sk_buff *skb) |