OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Allan Stephens 2010-11-30 12:01:03 +00:00 committed by David S. Miller
parent 12bae479ee
commit b924dcf003
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/tipc/port.c
View File

@ -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;

2
net/tipc/port.h
View File

@ -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);

3
net/tipc/socket.c
View File

@ -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);