diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-11-30 07:01:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-02 16:34:06 -0500 |
commit | b924dcf0038b8f83e65b44f679ad480d44f85aa6 (patch) | |
tree | 35efb719aa88def31d7acab12e99e97c07b11f3c /net/tipc/socket.c | |
parent | 12bae479ee414f45ad8fe93530f5b6ea241bde3f (diff) |
tipc: Delete tipc_ownidentity()
Moves the content of the native API routine tipc_ownidentity() into the
sole routine that calls it, since it can no longer be called in isolation.
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 34f96eda5fa3..cd0bb77f2673 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -403,7 +403,8 @@ static int get_name(struct socket *sock, struct sockaddr *uaddr, | |||
403 | addr->addr.id.ref = tsock->peer_name.ref; | 403 | addr->addr.id.ref = tsock->peer_name.ref; |
404 | addr->addr.id.node = tsock->peer_name.node; | 404 | addr->addr.id.node = tsock->peer_name.node; |
405 | } else { | 405 | } else { |
406 | tipc_ownidentity(tsock->p->ref, &addr->addr.id); | 406 | addr->addr.id.ref = tsock->p->ref; |
407 | addr->addr.id.node = tipc_own_addr; | ||
407 | } | 408 | } |
408 | 409 | ||
409 | *uaddr_len = sizeof(*addr); | 410 | *uaddr_len = sizeof(*addr); |