Merge tag 'wireless-drivers-next-for-davem-2015-02-07' of git://git.kernel.org/pub...

[deliverable/linux.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index a5b3140f145111c3b5102f2a355a1c1ada738ab4..817b2e9d42279185721300079ecb38228e478cd7 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -57,23 +57,56 @@
 #include <linux/vmalloc.h>
 #include <linux/rtnetlink.h>
 #include <linux/etherdevice.h>
+#include <net/netns/generic.h>
+#include <linux/rhashtable.h>
+
+#include "node.h"
+#include "bearer.h"
+#include "bcast.h"
+#include "netlink.h"
+#include "link.h"
+#include "node.h"
+#include "msg.h"
 
 #define TIPC_MOD_VER "2.0.0"
 
 int tipc_snprintf(char *buf, int len, const char *fmt, ...);
 
-/*
- * Global configuration variables
- */
-extern u32 tipc_own_addr __read_mostly;
 extern int tipc_net_id __read_mostly;
 extern int sysctl_tipc_rmem[3] __read_mostly;
 extern int sysctl_tipc_named_timeout __read_mostly;
 
-/*
- * Other global variables
- */
-extern int tipc_random __read_mostly;
+struct tipc_net {
+       u32 own_addr;
+       int net_id;
+       int random;
+
+       /* Node table and node list */
+       spinlock_t node_list_lock;
+       struct hlist_head node_htable[NODE_HTABLE_SIZE];
+       struct list_head node_list;
+       u32 num_nodes;
+       u32 num_links;
+
+       /* Bearer list */
+       struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1];
+
+       /* Broadcast link */
+       struct tipc_bcbearer *bcbearer;
+       struct tipc_bclink *bclink;
+       struct tipc_link *bcl;
+
+       /* Socket hash table */
+       struct rhashtable sk_rht;
+
+       /* Name table */
+       spinlock_t nametbl_lock;
+       struct name_table *nametbl;
+
+       /* Topology subscription server */
+       struct tipc_server *topsrv;
+       atomic_t subscription_count;
+};
 
 #ifdef CONFIG_SYSCTL
 int tipc_register_sysctl(void);