diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/tipc/port.c | 7 | ||||
-rw-r--r-- | net/tipc/port.h | 2 | ||||
-rw-r--r-- | net/tipc/socket.c | 3 |
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, | |||
983 | return 0; | 983 | return 0; |
984 | } | 984 | } |
985 | 985 | ||
986 | int tipc_ownidentity(u32 ref, struct tipc_portid *id) | ||
987 | { | ||
988 | id->ref = ref; | ||
989 | id->node = tipc_own_addr; | ||
990 | return 0; | ||
991 | } | ||
992 | |||
993 | int tipc_portimportance(u32 ref, unsigned int *importance) | 986 | int tipc_portimportance(u32 ref, unsigned int *importance) |
994 | { | 987 | { |
995 | struct port *p_ptr; | 988 | 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, | |||
191 | 191 | ||
192 | int tipc_deleteport(u32 portref); | 192 | int tipc_deleteport(u32 portref); |
193 | 193 | ||
194 | int tipc_ownidentity(u32 portref, struct tipc_portid *port); | ||
195 | |||
196 | int tipc_portimportance(u32 portref, unsigned int *importance); | 194 | int tipc_portimportance(u32 portref, unsigned int *importance); |
197 | int tipc_set_portimportance(u32 portref, unsigned int importance); | 195 | int tipc_set_portimportance(u32 portref, unsigned int importance); |
198 | 196 | ||
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, | |||
403 | addr->addr.id.ref = tsock->peer_name.ref; | 403 | addr->addr.id.ref = tsock->peer_name.ref; |
404 | addr->addr.id.node = tsock->peer_name.node; | 404 | addr->addr.id.node = tsock->peer_name.node; |
405 | } else { | 405 | } else { |
406 | tipc_ownidentity(tsock->p->ref, &addr->addr.id); | 406 | addr->addr.id.ref = tsock->p->ref; |
407 | addr->addr.id.node = tipc_own_addr; | ||
407 | } | 408 | } |
408 | 409 | ||
409 | *uaddr_len = sizeof(*addr); | 410 | *uaddr_len = sizeof(*addr); |