From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, allan.stephens@windriver.com
Subject: [PATCH net-next 11/11] tipc: Delete tipc_ownidentity()
Date: Tue, 30 Nov 2010 17:01:03 -0500 [thread overview]
Message-ID: <1291154463-26346-12-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1291154463-26346-1-git-send-email-paul.gortmaker@windriver.com>
From: Allan Stephens <Allan.Stephens@windriver.com>
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>
---
net/tipc/port.c | 7 -------
net/tipc/port.h | 2 --
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 73f232c..7873283 100644
--- 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 3f6c0aa..3a807fc 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,
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 34f96ed..cd0bb77 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,
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);
--
1.7.3.2.146.g2d444
next prev parent reply other threads:[~2010-11-30 22:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-30 22:00 [PATCH 0/11 net-next] TIPC cleanups for native API removal Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 01/11] tipc: Remove obsolete native API files and exports Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 02/11] tipc: Remove obsolete inclusions of header files Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 03/11] tipc: Delete unused configuration service structure definition Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 04/11] tipc: Eliminate useless return value when disabling a bearer Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 05/11] tipc: Delete useless function prototypes Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 06/11] tipc: Remove support for TIPC mode change callback Paul Gortmaker
2010-11-30 22:00 ` [PATCH net-next 07/11] tipc: Remove unused domain argument from multicast send routine Paul Gortmaker
2010-11-30 22:01 ` [PATCH net-next 08/11] tipc: Eliminate useless initialization when creating subscriber Paul Gortmaker
2010-11-30 22:01 ` [PATCH net-next 09/11] tipc: Eliminate an unused symbolic constant in link code Paul Gortmaker
2010-11-30 22:01 ` [PATCH net-next 10/11] tipc: Eliminate obsolete native API forwarding routines Paul Gortmaker
2010-11-30 22:01 ` Paul Gortmaker [this message]
2010-12-02 21:34 ` [PATCH 0/11 net-next] TIPC cleanups for native API removal David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291154463-26346-12-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=allan.stephens@windriver.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).