From ea714ccda5d5858ee677a77cf33dbaf34a0060c3 Mon Sep 17 00:00:00 2001
From: Per Liden <per.liden@nospam.ericsson.com>
Date: Wed, 11 Jan 2006 12:28:47 +0100
Subject: [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>
---
 include/net/tipc/tipc_bearer.h | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'include/net')

diff --git a/include/net/tipc/tipc_bearer.h b/include/net/tipc/tipc_bearer.h
index a3daf697b6b6..df7b9145a599 100644
--- a/include/net/tipc/tipc_bearer.h
+++ b/include/net/tipc/tipc_bearer.h
@@ -36,10 +36,36 @@
 
 #ifdef __KERNEL__
 
-#include <linux/tipc.h>
+#include <linux/tipc_config.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 
+/*
+ * Identifiers of supported TIPC media types
+ */
+
+#define TIPC_MEDIA_TYPE_ETH	1
+
+struct tipc_media_addr {
+	__u32  type;
+	union {
+		__u8   eth_addr[6];	/* Ethernet bearer */ 
+#if 0
+		/* Prototypes for other possible bearer types */
+
+		struct {
+			__u16 sin_family;
+			__u16 sin_port;
+			struct {
+				__u32 s_addr;
+			} sin_addr;
+			char pad[4];
+		} addr_in;		/* IP-based bearer */
+		__u16  sock_descr;	/* generic socket bearer */
+#endif
+	} dev_addr;
+};
+
 /**
  * struct tipc_bearer - TIPC bearer info available to privileged users
  * @usr_handle: pointer to additional user-defined information about bearer
-- 
cgit v1.2.2