From 4118034ac0dddcbb4aa2f06e60d15eecf3bd3d47 Mon Sep 17 00:00:00 2001
From: Allan Stephens <Allan.Stephens@windriver.com>
Date: Tue, 30 Nov 2010 12:01:03 +0000
Subject: [PATCH] --- yaml --- r: 224759 b: refs/heads/master c:
 b924dcf0038b8f83e65b44f679ad480d44f85aa6 h: refs/heads/master i:   224757:
 b9625da56e68054e351fa68a28dbf3db9e6208be   224755:
 e2ac8b604d901e4315d41b9ed2da63006642423c   224751:
 d9198b9c207ce19caffbd252193be1c7530ea73e v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/port.c   | 7 -------
 trunk/net/tipc/port.h   | 2 --
 trunk/net/tipc/socket.c | 3 ++-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index caff70d0fb94..2e1124daccd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12bae479ee414f45ad8fe93530f5b6ea241bde3f
+refs/heads/master: b924dcf0038b8f83e65b44f679ad480d44f85aa6
diff --git a/trunk/net/tipc/port.c b/trunk/net/tipc/port.c
index 73f232c1fe15..7873283f4965 100644
--- a/trunk/net/tipc/port.c
+++ b/trunk/net/tipc/port.c
@@ -983,13 +983,6 @@ int tipc_createport(u32 user_ref,
 	return 0;
 }
 
-int tipc_ownidentity(u32 ref, struct tipc_portid *id)
-{
-	id->ref = ref;
-	id->node = tipc_own_addr;
-	return 0;
-}
-
 int tipc_portimportance(u32 ref, unsigned int *importance)
 {
 	struct port *p_ptr;
diff --git a/trunk/net/tipc/port.h b/trunk/net/tipc/port.h
index 3f6c0aaa171d..3a807fcec2be 100644
--- a/trunk/net/tipc/port.h
+++ b/trunk/net/tipc/port.h
@@ -191,8 +191,6 @@ int tipc_createport(unsigned int tipc_user, void *usr_handle,
 
 int tipc_deleteport(u32 portref);
 
-int tipc_ownidentity(u32 portref, struct tipc_portid *port);
-
 int tipc_portimportance(u32 portref, unsigned int *importance);
 int tipc_set_portimportance(u32 portref, unsigned int importance);
 
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
index 34f96eda5fa3..cd0bb77f2673 100644
--- a/trunk/net/tipc/socket.c
+++ b/trunk/net/tipc/socket.c
@@ -403,7 +403,8 @@ static int get_name(struct socket *sock, struct sockaddr *uaddr,
 		addr->addr.id.ref = tsock->peer_name.ref;
 		addr->addr.id.node = tsock->peer_name.node;
 	} else {
-		tipc_ownidentity(tsock->p->ref, &addr->addr.id);
+		addr->addr.id.ref = tsock->p->ref;
+		addr->addr.id.node = tipc_own_addr;
 	}
 
 	*uaddr_len = sizeof(*addr);