diff options
Diffstat (limited to 'net/tipc/bearer.h')
-rw-r--r-- | net/tipc/bearer.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index c4e7c1c3655b..6a36b6600e6c 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * net/tipc/bearer.h: Include file for TIPC bearer code | 2 | * net/tipc/bearer.h: Include file for TIPC bearer code |
3 | * | 3 | * |
4 | * Copyright (c) 1996-2006, Ericsson AB | 4 | * Copyright (c) 1996-2006, Ericsson AB |
5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
@@ -58,14 +58,14 @@ | |||
58 | * @type_id: TIPC media identifier [defined in tipc_bearer.h] | 58 | * @type_id: TIPC media identifier [defined in tipc_bearer.h] |
59 | * @name: media name | 59 | * @name: media name |
60 | */ | 60 | */ |
61 | 61 | ||
62 | struct media { | 62 | struct media { |
63 | int (*send_msg)(struct sk_buff *buf, | 63 | int (*send_msg)(struct sk_buff *buf, |
64 | struct tipc_bearer *b_ptr, | 64 | struct tipc_bearer *b_ptr, |
65 | struct tipc_media_addr *dest); | 65 | struct tipc_media_addr *dest); |
66 | int (*enable_bearer)(struct tipc_bearer *b_ptr); | 66 | int (*enable_bearer)(struct tipc_bearer *b_ptr); |
67 | void (*disable_bearer)(struct tipc_bearer *b_ptr); | 67 | void (*disable_bearer)(struct tipc_bearer *b_ptr); |
68 | char *(*addr2str)(struct tipc_media_addr *a, | 68 | char *(*addr2str)(struct tipc_media_addr *a, |
69 | char *str_buf, int str_size); | 69 | char *str_buf, int str_size); |
70 | struct tipc_media_addr bcast_addr; | 70 | struct tipc_media_addr bcast_addr; |
71 | int bcast; | 71 | int bcast; |
@@ -91,7 +91,7 @@ struct media { | |||
91 | * @net_plane: network plane ('A' through 'H') currently associated with bearer | 91 | * @net_plane: network plane ('A' through 'H') currently associated with bearer |
92 | * @nodes: indicates which nodes in cluster can be reached through bearer | 92 | * @nodes: indicates which nodes in cluster can be reached through bearer |
93 | */ | 93 | */ |
94 | 94 | ||
95 | struct bearer { | 95 | struct bearer { |
96 | struct tipc_bearer publ; | 96 | struct tipc_bearer publ; |
97 | struct media *media; | 97 | struct media *media; |
@@ -131,21 +131,21 @@ void tipc_bearer_lock_push(struct bearer *b_ptr); | |||
131 | 131 | ||
132 | 132 | ||
133 | /** | 133 | /** |
134 | * tipc_bearer_send- sends buffer to destination over bearer | 134 | * tipc_bearer_send- sends buffer to destination over bearer |
135 | * | 135 | * |
136 | * Returns true (1) if successful, or false (0) if unable to send | 136 | * Returns true (1) if successful, or false (0) if unable to send |
137 | * | 137 | * |
138 | * IMPORTANT: | 138 | * IMPORTANT: |
139 | * The media send routine must not alter the buffer being passed in | 139 | * The media send routine must not alter the buffer being passed in |
140 | * as it may be needed for later retransmission! | 140 | * as it may be needed for later retransmission! |
141 | * | 141 | * |
142 | * If the media send routine returns a non-zero value (indicating that | 142 | * If the media send routine returns a non-zero value (indicating that |
143 | * it was unable to send the buffer), it must: | 143 | * it was unable to send the buffer), it must: |
144 | * 1) mark the bearer as blocked, | 144 | * 1) mark the bearer as blocked, |
145 | * 2) call tipc_continue() once the bearer is able to send again. | 145 | * 2) call tipc_continue() once the bearer is able to send again. |
146 | * Media types that are unable to meet these two critera must ensure their | 146 | * Media types that are unable to meet these two critera must ensure their |
147 | * send routine always returns success -- even if the buffer was not sent -- | 147 | * send routine always returns success -- even if the buffer was not sent -- |
148 | * and let TIPC's link code deal with the undelivered message. | 148 | * and let TIPC's link code deal with the undelivered message. |
149 | */ | 149 | */ |
150 | 150 | ||
151 | static inline int tipc_bearer_send(struct bearer *b_ptr, struct sk_buff *buf, | 151 | static inline int tipc_bearer_send(struct bearer *b_ptr, struct sk_buff *buf, |