Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/tipc/port.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

net/tipc/port.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

net/tipc/socket.c

+2 −1
Original line number Diff line number Diff line
@@ -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);