4 files changed, 31 insertions, 15 deletions

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 07c42fba672b..18098cac62f2 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -726,7 +726,7 @@ static void port_dispatcher_sigh(void *dummy)
                                 if (unlikely(!cb))
                                         goto reject;
                                 if (unlikely(!connected)) {
-                                        if (tipc_connect2port(dref, &orig))
+                                        if (tipc_connect(dref, &orig))
                                                 goto reject;
                                 } else if (peer_invalid)
                                         goto reject;
@@ -1036,15 +1036,30 @@ int tipc_withdraw(u32 ref, unsigned int scope, struct tipc_name_seq const *seq)
         return res;
 }
 
-int tipc_connect2port(u32 ref, struct tipc_portid const *peer)
+int tipc_connect(u32 ref, struct tipc_portid const *peer)
 {
         struct tipc_port *p_ptr;
-        struct tipc_msg *msg;
-        int res = -EINVAL;
+        int res;
 
         p_ptr = tipc_port_lock(ref);
         if (!p_ptr)
                 return -EINVAL;
+        res = __tipc_connect(ref, p_ptr, peer);
+        tipc_port_unlock(p_ptr);
+        return res;
+}
+
+/*
+ * __tipc_connect - connect to a remote peer
+ *
+ * Port must be locked.
+ */
+int __tipc_connect(u32 ref, struct tipc_port *p_ptr,
+                        struct tipc_portid const *peer)
+{
+        struct tipc_msg *msg;
+        int res = -EINVAL;
+
         if (p_ptr->published || p_ptr->connected)
                 goto exit;
         if (!peer->ref)
@@ -1067,17 +1082,16 @@ int tipc_connect2port(u32 ref, struct tipc_portid const *peer)
                           (net_ev_handler)port_handle_node_down);
         res = 0;
 exit:
-        tipc_port_unlock(p_ptr);
         p_ptr->max_pkt = tipc_link_get_max_pkt(peer->node, ref);
         return res;
 }
 
-/**
- * tipc_disconnect_port - disconnect port from peer
+/*
+ * __tipc_disconnect - disconnect port from peer
  *
  * Port must be locked.
  */
-int tipc_disconnect_port(struct tipc_port *tp_ptr)
+int __tipc_disconnect(struct tipc_port *tp_ptr)
 {
         int res;
 
@@ -1104,7 +1118,7 @@ int tipc_disconnect(u32 ref)
         p_ptr = tipc_port_lock(ref);
         if (!p_ptr)
                 return -EINVAL;
-        res = tipc_disconnect_port(p_ptr);
+        res = __tipc_disconnect(p_ptr);
         tipc_port_unlock(p_ptr);
         return res;
 }
diff --git a/net/tipc/port.h b/net/tipc/port.h
index 4660e3065790..fb66e2e5f4d1 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -190,7 +190,7 @@ int tipc_publish(u32 portref, unsigned int scope,
 int tipc_withdraw(u32 portref, unsigned int scope,
                 struct tipc_name_seq const *name_seq);
 
-int tipc_connect2port(u32 portref, struct tipc_portid const *port);
+int tipc_connect(u32 portref, struct tipc_portid const *port);
 
 int tipc_disconnect(u32 portref);
 
@@ -200,7 +200,9 @@ int tipc_shutdown(u32 ref);
 /*
  * The following routines require that the port be locked on entry
  */
-int tipc_disconnect_port(struct tipc_port *tp_ptr);
+int __tipc_disconnect(struct tipc_port *tp_ptr);
+int __tipc_connect(u32 ref, struct tipc_port *p_ptr,
+                   struct tipc_portid const *peer);
 int tipc_port_peer_msg(struct tipc_port *p_ptr, struct tipc_msg *msg);
 
 /*
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f553fdecc1d2..b630f3839ca3 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -783,7 +783,7 @@ static int auto_connect(struct socket *sock, struct tipc_msg *msg)
 
         tsock->peer_name.ref = msg_origport(msg);
         tsock->peer_name.node = msg_orignode(msg);
-        tipc_connect2port(tsock->p->ref, &tsock->peer_name);
+        tipc_connect(tsock->p->ref, &tsock->peer_name);
         tipc_set_portimportance(tsock->p->ref, msg_importance(msg));
         sock->state = SS_CONNECTED;
         return 0;
@@ -1246,7 +1246,7 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
         /* Initiate connection termination for an incoming 'FIN' */
         if (unlikely(msg_errcode(msg) && (sock->state == SS_CONNECTED))) {
                 sock->state = SS_DISCONNECTING;
-                tipc_disconnect_port(tipc_sk_port(sk));
+                __tipc_disconnect(tipc_sk_port(sk));
         }
 
         sk->sk_data_ready(sk, 0);
@@ -1506,7 +1506,7 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags)
                 /* Connect new socket to it's peer */
                 new_tsock->peer_name.ref = msg_origport(msg);
                 new_tsock->peer_name.node = msg_orignode(msg);
-                tipc_connect2port(new_ref, &new_tsock->peer_name);
+                tipc_connect(new_ref, &new_tsock->peer_name);
                 new_sock->state = SS_CONNECTED;
 
                 tipc_set_portimportance(new_ref, msg_importance(msg));
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 0f7d0d007e22..6b42d47029af 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -462,7 +462,7 @@ static void subscr_named_msg_event(void *usr_handle,
                 kfree(subscriber);
                 return;
         }
-        tipc_connect2port(subscriber->port_ref, orig);
+        tipc_connect(subscriber->port_ref, orig);
 
         /* Lock server port (& save lock address for future use) */
         subscriber->lock = tipc_port_lock(subscriber->port_ref)->lock;