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>

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 73f232c1fe1575bb188ba304ab1a3e5e7f4fb5cc..7873283f496577715ece971401ca96e1d19883e0 100644 (file)
--- 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 3f6c0aaa171d19edd3e9b20b1703f1a16b313841..3a807fcec2bee7bf1fb470a0063ce72131c0339b 100644 (file)
--- 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 34f96eda5fa34b2014f8370e12ed114038afab01..cd0bb77f26732669b30422341e27ae9633422053 100644 (file)
--- 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);