tipc: add new function for sending multiple small messages

We see an increasing need to send multiple single-buffer messages
of TIPC_SYSTEM_IMPORTANCE to different individual destination nodes.
Instead of looping over the send queue and sending each buffer
individually, as we do now, we add a new help function
tipc_node_distr_xmit() to do this.

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

1 files changed, 2 insertions, 12 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index bc226f5a1be3..c7c674934474 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1740,14 +1740,11 @@ static void tipc_sk_filter_rcv(struct sock *sk, struct sk_buff *skb,
  * @skb: message
  *
  * Caller must hold socket lock
- *
- * Returns 0
  */
 static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 {
         unsigned int before = sk_rmem_alloc_get(sk);
         struct sk_buff_head xmitq;
-        u32 dnode, selector;
         unsigned int added;
 
         __skb_queue_head_init(&xmitq);
@@ -1757,11 +1754,7 @@ static int tipc_sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
         atomic_add(added, &tipc_sk(sk)->dupl_rcvcnt);
 
         /* Send pending response/rejected messages, if any */
-        while ((skb = __skb_dequeue(&xmitq))) {
-                selector = msg_origport(buf_msg(skb));
-                dnode = msg_destnode(buf_msg(skb));
-                tipc_node_xmit_skb(sock_net(sk), skb, dnode, selector);
-        }
+        tipc_node_distr_xmit(sock_net(sk), &xmitq);
         return 0;
 }
 
@@ -1840,10 +1833,7 @@ void tipc_sk_rcv(struct net *net, struct sk_buff_head *inputq)
                                 spin_unlock_bh(&sk->sk_lock.slock);
                         }
                         /* Send pending response/rejected messages, if any */
-                        while ((skb = __skb_dequeue(&xmitq))) {
-                                dnode = msg_destnode(buf_msg(skb));
-                                tipc_node_xmit_skb(net, skb, dnode, dport);
-                        }
+                        tipc_node_distr_xmit(sock_net(sk), &xmitq);
                         sock_put(sk);
                         continue;
                 }