[TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 5 deletions

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 92601385e5f5..ee9b4484d85c 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -176,7 +176,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf)
                         n_ptr = tipc_node_create(orig);
                 }
                 if (n_ptr == NULL) {
-                        warn("Memory squeeze; Failed to create node\n");
                         return;
                 }
                 spin_lock_bh(&n_ptr->lock);
@@ -191,10 +190,8 @@ void tipc_disc_recv_msg(struct sk_buff *buf)
                 }
                 addr = &link->media_addr;
                 if (memcmp(addr, &media_addr, sizeof(*addr))) {
-                        char addr_string[16];
-
-                        warn("New bearer address for %s\n", 
-                             addr_string_fill(addr_string, orig));
+                        warn("Resetting link <%s>, peer interface address changed\n",
+                             link->name);
                         memcpy(addr, &media_addr, sizeof(*addr));
                         tipc_link_reset(link);     
                 }