Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 600c433e146730be7ffd4d114a90f22a0605af12..fd42e106c18539152822d1bfdceefc25a036b164 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -60,36 +60,11 @@
 
 #define TIPC_MOD_VER "2.0.0"
 
-struct tipc_msg;       /* msg.h */
-struct print_buf;      /* log.h */
-
-/*
- * TIPC system monitoring code
- */
+#define ULTRA_STRING_MAX_LEN 32768
 
-/*
- * TIPC's print buffer subsystem supports the following print buffers:
- *
- * TIPC_NULL : null buffer (i.e. print nowhere)
- * TIPC_CONS : system console
- * TIPC_LOG  : TIPC log buffer
- * &buf             : user-defined buffer (struct print_buf *)
- *
- * Note: TIPC_LOG is configured to echo its output to the system console;
- *       user-defined buffers can be configured to do the same thing.
- */
-extern struct print_buf *const TIPC_NULL;
-extern struct print_buf *const TIPC_CONS;
-extern struct print_buf *const TIPC_LOG;
-
-void tipc_printf(struct print_buf *, const char *fmt, ...);
+struct tipc_msg;       /* msg.h */
 
-/*
- * TIPC_OUTPUT is the destination print buffer for system messages.
- */
-#ifndef TIPC_OUTPUT
-#define TIPC_OUTPUT TIPC_LOG
-#endif
+int tipc_snprintf(char *buf, int len, const char *fmt, ...);
 
 /*
  * TIPC-specific error codes