aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorPer Liden <per.liden@nospam.ericsson.com>2006-01-11 12:28:47 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 14:06:35 -0800
commitea714ccda5d5858ee677a77cf33dbaf34a0060c3 (patch)
tree4621c81792b6b60b101d3644f4a4fd8c5fd964cb /net/tipc
parent[TIPC} Fixed bug in disc_timeout() (diff)
downloadlinux-dev-ea714ccda5d5858ee677a77cf33dbaf34a0060c3.tar.xz
linux-dev-ea714ccda5d5858ee677a77cf33dbaf34a0060c3.zip
[TIPC] Moved configuration interface into tipc_config.h
Restored the old tipc_config.h to get a cleaner division between the interfaces used by normal TIPC users and TIPC administration utilities. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/config.h1
-rw-r--r--net/tipc/socket.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/config.h b/net/tipc/config.h
index 7ac0af57bf57..ca76cb85a3b7 100644
--- a/net/tipc/config.h
+++ b/net/tipc/config.h
@@ -37,6 +37,7 @@
/* ---------------------------------------------------------------------- */
#include <linux/tipc.h>
+#include <linux/tipc_config.h>
#include "link.h"
struct sk_buff *cfg_reply_alloc(int payload_size);
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 22dcb724e760..688de0bf72d5 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -48,6 +48,7 @@
#include <net/sock.h>
#include <linux/tipc.h>
+#include <linux/tipc_config.h>
#include <net/tipc/tipc_msg.h>
#include <net/tipc/tipc_port.h>