Commit b924dcf0 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller

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: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12bae479
...@@ -983,13 +983,6 @@ int tipc_createport(u32 user_ref, ...@@ -983,13 +983,6 @@ int tipc_createport(u32 user_ref,
return 0; 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) int tipc_portimportance(u32 ref, unsigned int *importance)
{ {
struct port *p_ptr; struct port *p_ptr;
......
...@@ -191,8 +191,6 @@ int tipc_createport(unsigned int tipc_user, void *usr_handle, ...@@ -191,8 +191,6 @@ int tipc_createport(unsigned int tipc_user, void *usr_handle,
int tipc_deleteport(u32 portref); int tipc_deleteport(u32 portref);
int tipc_ownidentity(u32 portref, struct tipc_portid *port);
int tipc_portimportance(u32 portref, unsigned int *importance); int tipc_portimportance(u32 portref, unsigned int *importance);
int tipc_set_portimportance(u32 portref, unsigned int importance); int tipc_set_portimportance(u32 portref, unsigned int importance);
......
...@@ -403,7 +403,8 @@ static int get_name(struct socket *sock, struct sockaddr *uaddr, ...@@ -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.ref = tsock->peer_name.ref;
addr->addr.id.node = tsock->peer_name.node; addr->addr.id.node = tsock->peer_name.node;
} else { } 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); *uaddr_len = sizeof(*addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment