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>

1 files changed, 5 insertions, 7 deletions

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index f908b804a968..17652f20a359 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -136,20 +136,18 @@ exit:
 
 void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)
 {
+        char addr_str[MAX_ADDR_STR];
         struct media *m_ptr;
         u32 media_type;
-        u32 i;
 
         media_type = ntohl(a->type);
         m_ptr = media_find_id(media_type);
 
-        if (m_ptr && (m_ptr->addr2str != NULL)) {
-                char addr_str[MAX_ADDR_STR];
-
-                tipc_printf(pb, "%s(%s)", m_ptr->name,
-                            m_ptr->addr2str(a, addr_str, sizeof(addr_str)));
-        } else {
+        if (m_ptr && !m_ptr->addr2str(a, addr_str, sizeof(addr_str)))
+                tipc_printf(pb, "%s(%s)", m_ptr->name, addr_str);
+        else {
                 unchar *addr = (unchar *)&a->dev_addr;
+                u32 i;
 
                 tipc_printf(pb, "UNKNOWN(%u)", media_type);
                 for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++)