linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 762aac2..1f2e8b2 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -2,7 +2,7 @@
  * net/tipc/core.h: Include file for TIPC global declarations
  * 
  * Copyright (c) 2005-2006, Ericsson AB
- * Copyright (c) 2005-2006, Wind River Systems
+ * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -111,6 +111,10 @@ void tipc_dump(struct print_buf*,const char *fmt, ...);
 
 #else
 
+#ifndef DBG_OUTPUT
+#define DBG_OUTPUT NULL
+#endif
+
 /*
  * TIPC debug support not included:
  * - system messages are printed to system console
@@ -125,19 +129,6 @@ void tipc_dump(struct print_buf*,const char *fmt, ...);
 #define msg_dbg(msg,txt) do {} while (0)
 #define dump(fmt,arg...) do {} while (0)
 
-
-/*     
- * TIPC_OUTPUT is defined to be the system console, while DBG_OUTPUT is
- * the null print buffer.  Thes ensures that any system or debug messages 
- * that are generated without using the above macros are handled correctly.
- */
-
-#undef  TIPC_OUTPUT
-#define TIPC_OUTPUT TIPC_CONS
-
-#undef  DBG_OUTPUT
-#define DBG_OUTPUT NULL
-
 #endif                   
 
 
@@ -297,10 +288,7 @@ static inline struct tipc_msg *buf_msg(struct sk_buff *skb)
  * buf_acquire - creates a TIPC message buffer
  * @size: message size (including TIPC header)
  *
- * Returns a new buffer with data pointers set to the specified size.
- * 
- * NOTE: Headroom is reserved to allow prepending of a data link header.
- *       There may also be unrequested tailroom present at the buffer's end.
+ * Returns a new buffer.  Space is reserved for a data link header.
  */
 
 static inline struct sk_buff *buf_acquire(u32 size)
@@ -321,7 +309,7 @@ static inline struct sk_buff *buf_acquire(u32 size)
  * buf_discard - frees a TIPC message buffer
  * @skb: message buffer
  *
- * Frees a message buffer.  If passed NULL, just returns.
+ * Frees a new buffer.  If passed NULL, just returns.
  */
 
 static inline void buf_discard(struct sk_buff *skb)