diff options
Diffstat (limited to 'net/tipc/bearer.h')
-rw-r--r-- | net/tipc/bearer.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 41a61d219c38..54a5a575d69a 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h | |||
@@ -59,17 +59,16 @@ | |||
59 | #define TIPC_MEDIA_TYPE_ETH 1 | 59 | #define TIPC_MEDIA_TYPE_ETH 1 |
60 | 60 | ||
61 | /* | 61 | /* |
62 | * Destination address structure used by TIPC bearers when sending messages | 62 | * struct tipc_media_addr - destination address used by TIPC bearers |
63 | * | 63 | * @value: address info (format defined by media) |
64 | * IMPORTANT: The fields of this structure MUST be stored using the specified | 64 | * @media_id: TIPC media type identifier |
65 | * byte order indicated below, as the structure is exchanged between nodes | 65 | * @broadcast: non-zero if address is a broadcast address |
66 | * as part of a link setup process. | ||
67 | */ | 66 | */ |
67 | |||
68 | struct tipc_media_addr { | 68 | struct tipc_media_addr { |
69 | __be32 type; /* bearer type (network byte order) */ | 69 | u8 value[TIPC_MEDIA_ADDR_SIZE]; |
70 | union { | 70 | u8 media_id; |
71 | __u8 eth_addr[6]; /* 48 bit Ethernet addr (byte array) */ | 71 | u8 broadcast; |
72 | } dev_addr; | ||
73 | }; | 72 | }; |
74 | 73 | ||
75 | struct tipc_bearer; | 74 | struct tipc_bearer; |