tipc: redefine message acknowledge function

The function tipc_acknowledge() is a remnant from the obsolete native
API. Currently, it grabs port_lock, before building an acknowledge
message and sending it to the peer.

Since all access to socket members now is protected by the socket lock,
it has become unnecessary to grab port_lock here.

In this commit, we remove the usage of port_lock, simplify the
function, and move it to socket.c, renaming it to tipc_sk_send_ack().

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 2f96719a35149dddea23dfc32395927483b7b03f..1074ccb0c76f1b42889ccf9beacd9a25c545a1a8 100644 (file)
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -221,28 +221,6 @@ void tipc_port_reinit(void)
        spin_unlock_bh(&tipc_port_list_lock);
 }
 
-void tipc_acknowledge(u32 ref, u32 ack)
-{
-       struct tipc_port *p_ptr;
-       struct sk_buff *buf = NULL;
-       struct tipc_msg *msg;
-
-       p_ptr = tipc_port_lock(ref);
-       if (!p_ptr)
-               return;
-       if (p_ptr->connected)
-               buf = tipc_msg_create(CONN_MANAGER, CONN_ACK, INT_H_SIZE,
-                                     0, tipc_port_peernode(p_ptr),
-                                     tipc_own_addr, tipc_port_peerport(p_ptr),
-                                     p_ptr->ref, TIPC_OK);
-       tipc_port_unlock(p_ptr);
-       if (!buf)
-               return;
-       msg = buf_msg(buf);
-       msg_set_msgcnt(msg, ack);
-       tipc_link_xmit(buf, msg_destnode(msg),  msg_link_selector(msg));
-}
-
 int tipc_publish(struct tipc_port *p_ptr, unsigned int scope,
                 struct tipc_name_seq const *seq)
 {

diff --git a/net/tipc/port.h b/net/tipc/port.h
index b356cb8340d93f4a26a9a2a0f267dc017ac835c8..c92e1721f672e5a756b780d222a0525837d1715c 100644 (file)
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -92,8 +92,6 @@ struct tipc_port_list;
 u32 tipc_port_init(struct tipc_port *p_ptr,
                   const unsigned int importance);
 
-void tipc_acknowledge(u32 port_ref, u32 ack);
-
 void tipc_port_destroy(struct tipc_port *p_ptr);
 
 int tipc_publish(struct tipc_port *p_ptr, unsigned int scope,

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index a65105818fe501147c29295583da4d5eaa27becf..686a11be5c588ab0126a29acc6c596d5851ca4a9 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1106,6 +1106,24 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg,
        return 0;
 }
 
+static void tipc_sk_send_ack(struct tipc_port *port, uint ack)
+{
+       struct sk_buff *buf = NULL;
+       struct tipc_msg *msg;
+       u32 peer_port = tipc_port_peerport(port);
+       u32 dnode = tipc_port_peernode(port);
+
+       if (!port->connected)
+               return;
+       buf = tipc_msg_create(CONN_MANAGER, CONN_ACK, INT_H_SIZE, 0, dnode,
+                             tipc_own_addr, peer_port, port->ref, TIPC_OK);
+       if (!buf)
+               return;
+       msg = buf_msg(buf);
+       msg_set_msgcnt(msg, ack);
+       tipc_link_xmit(buf, dnode, msg_link_selector(msg));
+}
+
 static int tipc_wait_for_rcvmsg(struct socket *sock, long *timeop)
 {
        struct sock *sk = sock->sk;
@@ -1226,7 +1244,7 @@ restart:
        if (likely(!(flags & MSG_PEEK))) {
                if ((sock->state != SS_READY) &&
                    (++tsk->rcv_unacked >= TIPC_CONNACK_INTV)) {
-                       tipc_acknowledge(port->ref, tsk->rcv_unacked);
+                       tipc_sk_send_ack(port, tsk->rcv_unacked);
                        tsk->rcv_unacked = 0;
                }
                advance_rx_queue(sk);
@@ -1337,7 +1355,7 @@ restart:
        /* Consume received message (optional) */
        if (likely(!(flags & MSG_PEEK))) {
                if (unlikely(++tsk->rcv_unacked >= TIPC_CONNACK_INTV)) {
-                       tipc_acknowledge(port->ref, tsk->rcv_unacked);
+                       tipc_sk_send_ack(port, tsk->rcv_unacked);
                        tsk->rcv_unacked = 0;
                }
                advance_rx_queue(sk);