summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJon Maloy2006-01-13 11:45:44 +0100
committerPer Liden2006-01-18 00:45:14 +0100
commit5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1 (patch)
treede2954670c63c9f9c584c7cec633f72047215aa3 /net
parent[NET]: Use is_zero_ether_addr() in net/core/netpoll.c (diff)
downloadkernel-qcow2-linux-5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1.tar.gz
kernel-qcow2-linux-5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1.tar.xz
kernel-qcow2-linux-5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1.zip
[TIPC] Minor changes to #includes
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/bearer.h2
-rw-r--r--net/tipc/config.h3
-rw-r--r--net/tipc/core.h5
-rw-r--r--net/tipc/discover.h2
-rw-r--r--net/tipc/msg.h2
-rw-r--r--net/tipc/port.h2
6 files changed, 10 insertions, 6 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 21e63d3f0183..0c40cc2b43cc 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -37,7 +37,7 @@
#ifndef _TIPC_BEARER_H
#define _TIPC_BEARER_H
-#include <net/tipc/tipc_bearer.h>
+#include "core.h"
#include "bcast.h"
#define MAX_BEARERS 8
diff --git a/net/tipc/config.h b/net/tipc/config.h
index 646377d40454..e74d94f753c9 100644
--- a/net/tipc/config.h
+++ b/net/tipc/config.h
@@ -39,8 +39,7 @@
/* ---------------------------------------------------------------------- */
-#include <linux/tipc.h>
-#include <linux/tipc_config.h>
+#include "core.h"
#include "link.h"
struct sk_buff *cfg_reply_alloc(int payload_size);
diff --git a/net/tipc/core.h b/net/tipc/core.h
index b69b60b2cc86..1a34cc95b9e0 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -37,6 +37,11 @@
#ifndef _TIPC_CORE_H
#define _TIPC_CORE_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>
diff --git a/net/tipc/discover.h b/net/tipc/discover.h
index 2a6114d91626..f4acb360d6c3 100644
--- a/net/tipc/discover.h
+++ b/net/tipc/discover.h
@@ -37,7 +37,7 @@
#ifndef _TIPC_DISCOVER_H
#define _TIPC_DISCOVER_H
-#include <linux/tipc.h>
+#include "core.h"
struct link_req;
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 662c81862a0c..6574aab11fa4 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -37,7 +37,7 @@
#ifndef _TIPC_MSG_H
#define _TIPC_MSG_H
-#include <net/tipc/tipc_msg.h>
+#include "core.h"
#define TIPC_VERSION 2
#define DATA_LOW TIPC_LOW_IMPORTANCE
diff --git a/net/tipc/port.h b/net/tipc/port.h
index e829a99d3b7f..f4a8c2be3faa 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -37,7 +37,7 @@
#ifndef _TIPC_PORT_H
#define _TIPC_PORT_H
-#include <net/tipc/tipc_port.h>
+#include "core.h"
#include "ref.h"
#include "net.h"
#include "msg.h"