aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPer Liden <per.liden@nospam.ericsson.com>2006-01-11 06:28:47 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 17:06:35 -0500
commitea714ccda5d5858ee677a77cf33dbaf34a0060c3 (patch)
tree4621c81792b6b60b101d3644f4a4fd8c5fd964cb /include/net
parentb70e4f45a8d8125e4f420c62e71688b8a766689a (diff)
[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 'include/net')
-rw-r--r--include/net/tipc/tipc_bearer.h28
1 files changed, 27 insertions, 1 deletions
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 @@
36 36
37#ifdef __KERNEL__ 37#ifdef __KERNEL__
38 38
39#include <linux/tipc.h> 39#include <linux/tipc_config.h>
40#include <linux/skbuff.h> 40#include <linux/skbuff.h>
41#include <linux/spinlock.h> 41#include <linux/spinlock.h>
42 42
43/*
44 * Identifiers of supported TIPC media types
45 */
46
47#define TIPC_MEDIA_TYPE_ETH 1
48
49struct tipc_media_addr {
50 __u32 type;
51 union {
52 __u8 eth_addr[6]; /* Ethernet bearer */
53#if 0
54 /* Prototypes for other possible bearer types */
55
56 struct {
57 __u16 sin_family;
58 __u16 sin_port;
59 struct {
60 __u32 s_addr;
61 } sin_addr;
62 char pad[4];
63 } addr_in; /* IP-based bearer */
64 __u16 sock_descr; /* generic socket bearer */
65#endif
66 } dev_addr;
67};
68
43/** 69/**
44 * struct tipc_bearer - TIPC bearer info available to privileged users 70 * struct tipc_bearer - TIPC bearer info available to privileged users
45 * @usr_handle: pointer to additional user-defined information about bearer 71 * @usr_handle: pointer to additional user-defined information about bearer