summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2010-11-30 12:01:03 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-02 13:34:06 -0800
commitb924dcf0038b8f83e65b44f679ad480d44f85aa6 (patch)
tree35efb719aa88def31d7acab12e99e97c07b11f3c /net/tipc
parent12bae479ee414f45ad8fe93530f5b6ea241bde3f (diff)
downloadlinux-b924dcf0038b8f83e65b44f679ad480d44f85aa6.tar.bz2
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')
-rw-r--r--net/tipc/port.c7
-rw-r--r--net/tipc/port.h2
-rw-r--r--net/tipc/socket.c3
3 files changed, 2 insertions, 10 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c
index 73f232c1fe15..7873283f4965 100644
--- a/net/tipc/port.c
+++ b/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/net/tipc/port.h b/net/tipc/port.h
index 3f6c0aaa171d..3a807fcec2be 100644
--- a/net/tipc/port.h
+++ b/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/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,
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);