git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tipc: Remove prototype code for supporting multiple clusters
[pandora-kernel.git]
/
net
/
tipc
/
core.h
diff --git
a/net/tipc/core.h
b/net/tipc/core.h
index
e19389e
..
c44f955
100644
(file)
--- a/
net/tipc/core.h
+++ b/
net/tipc/core.h
@@
-39,10
+39,6
@@
#include <linux/tipc.h>
#include <linux/tipc_config.h>
#include <linux/tipc.h>
#include <linux/tipc_config.h>
-#include <net/tipc/tipc_msg.h>
-#include <net/tipc/tipc_port.h>
-#include <net/tipc/tipc_bearer.h>
-#include <net/tipc/tipc.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-62,6
+58,9
@@
#define TIPC_MOD_VER "2.0.0"
#define TIPC_MOD_VER "2.0.0"
+struct tipc_msg; /* msg.h */
+struct print_buf; /* dbg.h */
+
/*
* TIPC sanity test macros
*/
/*
* TIPC sanity test macros
*/
@@
-173,15
+172,19
@@
void tipc_dump_dbg(struct print_buf *, const char *fmt, ...);
#define ELINKCONG EAGAIN /* link congestion <=> resource unavailable */
#define ELINKCONG EAGAIN /* link congestion <=> resource unavailable */
+/*
+ * TIPC operating mode routines
+ */
+#define TIPC_NOT_RUNNING 0
+#define TIPC_NODE_MODE 1
+#define TIPC_NET_MODE 2
+
/*
* Global configuration variables
*/
extern u32 tipc_own_addr;
/*
* Global configuration variables
*/
extern u32 tipc_own_addr;
-extern int tipc_max_zones;
-extern int tipc_max_clusters;
extern int tipc_max_nodes;
extern int tipc_max_nodes;
-extern int tipc_max_slaves;
extern int tipc_max_ports;
extern int tipc_max_subscriptions;
extern int tipc_max_publications;
extern int tipc_max_ports;
extern int tipc_max_subscriptions;
extern int tipc_max_publications;