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>

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 3b7162c1f07425b07c36b67d94d9655f8748855c..f1f6b33f761c5ef7c32e321ff7a44e7c36df8999 100644 (file)
--- 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 9b88531e5a610b7429881516b212033dece930f7..0a632a6fc0599e1e3d919f2a52517a73ff47fb49 100644 (file)
--- 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);