diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-23 20:47:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-23 20:47:56 -0800 |
| commit | 55ae22d08fc9b531bc8a88b7306004e7053bb425 (patch) | |
| tree | d60dd4970f9bc2fb5ce21571c862d421f4a00402 /net/tipc/node.c | |
| parent | d12b0d9adc46888e3bb0224886105bf3b188553b (diff) | |
| parent | bf781ecfc6d6ecc4f66762a870f9c1fc76b9c8d5 (diff) | |
Merge branch 'tipc-Feb23-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
Diffstat (limited to 'net/tipc/node.c')
| -rw-r--r-- | net/tipc/node.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 3af53e327f49..e4dba1dfb6ea 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -2,7 +2,7 @@ * net/tipc/node.c: TIPC node management routines * * Copyright (c) 2000-2006, Ericsson AB - * Copyright (c) 2005-2006, Wind River Systems + * Copyright (c) 2005-2006, 2010-2011, Wind River Systems * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -238,7 +238,7 @@ struct tipc_node *tipc_node_attach_link(struct link *l_ptr) return n_ptr; } err("Attempt to establish second link on <%s> to %s\n", - l_ptr->b_ptr->publ.name, + l_ptr->b_ptr->name, tipc_addr_string_fill(addr_string, l_ptr->addr)); } return NULL; |