aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/bearer.h
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-10-07 11:31:49 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-27 11:13:06 -0500
commitc61b666e260d5cc2e0203b21c689321e6ab0d676 (patch)
tree3099d9f46c035b36c7555e75221df44f79f477a3 /net/tipc/bearer.h
parent6c349210101352103d9055636845155bc801ae9b (diff)
tipc: Improve handling of media address printing errors
Enhances conversion of a media address to printable form so that an unconvertable address will be displayed as a string of hex digits, rather than not being displayed at all. (Also removes a pointless check for the existence of the media-specific address conversion routine, since the routine is not optional.) Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/bearer.h')
-rw-r--r--net/tipc/bearer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 148ed04493a..4e9367f956a 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -83,8 +83,7 @@ struct media {
struct tipc_media_addr *dest);
int (*enable_bearer)(struct tipc_bearer *b_ptr);
void (*disable_bearer)(struct tipc_bearer *b_ptr);
- char *(*addr2str)(struct tipc_media_addr *a,
- char *str_buf, int str_size);
+ int (*addr2str)(struct tipc_media_addr *a, char *str_buf, int str_size);
struct tipc_media_addr bcast_addr;
u32 priority;
u32 tolerance;