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

[linux-2.6.git] / net / tipc / discover.c

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 53ba463..ee9b448 100644 (file)
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -110,10 +110,10 @@ void tipc_disc_link_event(u32 addr, char *name, int up)
  * @b_ptr: ptr to bearer issuing message
  */
 
-struct sk_buff *tipc_disc_init_msg(u32 type,
-                                  u32 req_links,
-                                  u32 dest_domain,
-                                  struct bearer *b_ptr)
+static struct sk_buff *tipc_disc_init_msg(u32 type,
+                                         u32 req_links,
+                                         u32 dest_domain,
+                                         struct bearer *b_ptr)
 {
        struct sk_buff *buf = buf_acquire(DSC_H_SIZE);
        struct tipc_msg *msg;
@@ -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);     
                }