diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2012-04-17 18:36:42 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-19 15:46:43 -0400 |
| commit | d0e17fedc2aeb0c4db09434787ef6d432582e050 (patch) | |
| tree | 5e64f449fc309a6fb9be4e5b954f8ce286abfa62 | |
| parent | f21536d1e73c36b37c50f71013c67f19db77d4b8 (diff) | |
| download | linux-3.10-d0e17fedc2aeb0c4db09434787ef6d432582e050.tar.gz linux-3.10-d0e17fedc2aeb0c4db09434787ef6d432582e050.tar.bz2 linux-3.10-d0e17fedc2aeb0c4db09434787ef6d432582e050.zip | |
tipc: delete duplicate peerport/peernode helper functions
Prior to commit 23dd4cce387124ec3ea06ca30d17854ae4d9b772
"tipc: Combine port structure with tipc_port structure"
there was a need for the two sets of helper functions. But
now they are just duplicates. Remove the globally visible
ones, and mark the remaining ones as inline.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | net/tipc/port.c | 8 | ||||
| -rw-r--r-- | net/tipc/port.h | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c index 3b7162c1f07..f1f6b33f761 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c @@ -59,12 +59,12 @@ static struct sk_buff *port_build_peer_abort_msg(struct tipc_port *, u32 err); static void port_timeout(unsigned long ref); -static u32 port_peernode(struct tipc_port *p_ptr) +static inline u32 port_peernode(struct tipc_port *p_ptr) { return msg_destnode(&p_ptr->phdr); } -static u32 port_peerport(struct tipc_port *p_ptr) +static inline u32 port_peerport(struct tipc_port *p_ptr) { return msg_destport(&p_ptr->phdr); } @@ -1159,9 +1159,9 @@ int tipc_port_recv_msg(struct sk_buff *buf) if (likely(p_ptr)) { if (likely(p_ptr->connected)) { if ((unlikely(msg_origport(msg) != - tipc_peer_port(p_ptr))) || + port_peerport(p_ptr))) || (unlikely(msg_orignode(msg) != - tipc_peer_node(p_ptr))) || + port_peernode(p_ptr))) || (unlikely(!msg_connected(msg)))) { err = TIPC_ERR_NO_PORT; tipc_port_unlock(p_ptr); diff --git a/net/tipc/port.h b/net/tipc/port.h index 9b88531e5a6..0a632a6fc05 100644 --- a/net/tipc/port.h +++ b/net/tipc/port.h @@ -257,16 +257,6 @@ static inline struct tipc_port *tipc_port_deref(u32 ref) return (struct tipc_port *)tipc_ref_deref(ref); } -static inline u32 tipc_peer_port(struct tipc_port *p_ptr) -{ - return msg_destport(&p_ptr->phdr); -} - -static inline u32 tipc_peer_node(struct tipc_port *p_ptr) -{ - return msg_destnode(&p_ptr->phdr); -} - static inline int tipc_port_congested(struct tipc_port *p_ptr) { return (p_ptr->sent - p_ptr->acked) >= (TIPC_FLOW_CONTROL_WIN * 2); |