diff options
Diffstat (limited to 'net/tipc/discover.c')
| -rw-r--r-- | net/tipc/discover.c | 7 |
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) | |||
| 176 | n_ptr = tipc_node_create(orig); | 176 | n_ptr = tipc_node_create(orig); |
| 177 | } | 177 | } |
| 178 | if (n_ptr == NULL) { | 178 | if (n_ptr == NULL) { |
| 179 | warn("Memory squeeze; Failed to create node\n"); | ||
| 180 | return; | 179 | return; |
| 181 | } | 180 | } |
| 182 | spin_lock_bh(&n_ptr->lock); | 181 | spin_lock_bh(&n_ptr->lock); |
| @@ -191,10 +190,8 @@ void tipc_disc_recv_msg(struct sk_buff *buf) | |||
| 191 | } | 190 | } |
| 192 | addr = &link->media_addr; | 191 | addr = &link->media_addr; |
| 193 | if (memcmp(addr, &media_addr, sizeof(*addr))) { | 192 | if (memcmp(addr, &media_addr, sizeof(*addr))) { |
| 194 | char addr_string[16]; | 193 | warn("Resetting link <%s>, peer interface address changed\n", |
| 195 | 194 | link->name); | |
| 196 | warn("New bearer address for %s\n", | ||
| 197 | addr_string_fill(addr_string, orig)); | ||
| 198 | memcpy(addr, &media_addr, sizeof(*addr)); | 195 | memcpy(addr, &media_addr, sizeof(*addr)); |
| 199 | tipc_link_reset(link); | 196 | tipc_link_reset(link); |
| 200 | } | 197 | } |
