Merge tag 'for-5.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

[linux.git] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 83ae41d7e5548077778c805e6c3367cdbf674313..3b9f8cc328f5c3aa2f39b5a8267bd206e714835f 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -809,7 +809,7 @@ static int tipc_sendmcast(struct  socket *sock, struct tipc_name_seq *seq,
        msg_set_nameupper(hdr, seq->upper);
 
        /* Build message as chain of buffers */
-       skb_queue_head_init(&pkts);
+       __skb_queue_head_init(&pkts);
        rc = tipc_msg_build(hdr, msg, 0, dlen, mtu, &pkts);
 
        /* Send message if build was successful */
@@ -853,7 +853,7 @@ static int tipc_send_group_msg(struct net *net, struct tipc_sock *tsk,
        msg_set_grp_bc_seqno(hdr, bc_snd_nxt);
 
        /* Build message as chain of buffers */
-       skb_queue_head_init(&pkts);
+       __skb_queue_head_init(&pkts);
        mtu = tipc_node_get_mtu(net, dnode, tsk->portid);
        rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
        if (unlikely(rc != dlen))
@@ -1058,7 +1058,7 @@ static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
        msg_set_grp_bc_ack_req(hdr, ack);
 
        /* Build message as chain of buffers */
-       skb_queue_head_init(&pkts);
+       __skb_queue_head_init(&pkts);
        rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
        if (unlikely(rc != dlen))
                return rc;
@@ -1387,7 +1387,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
        if (unlikely(rc))
                return rc;
 
-       skb_queue_head_init(&pkts);
+       __skb_queue_head_init(&pkts);
        mtu = tipc_node_get_mtu(net, dnode, tsk->portid);
        rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
        if (unlikely(rc != dlen))
@@ -1445,7 +1445,7 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen)
        int send, sent = 0;
        int rc = 0;
 
-       skb_queue_head_init(&pkts);
+       __skb_queue_head_init(&pkts);
 
        if (unlikely(dlen > INT_MAX))
                return -EMSGSIZE;
@@ -1805,7 +1805,7 @@ static int tipc_recvmsg(struct socket *sock, struct msghdr *m,
 
        /* Send group flow control advertisement when applicable */
        if (tsk->group && msg_in_group(hdr) && !grp_evt) {
-               skb_queue_head_init(&xmitq);
+               __skb_queue_head_init(&xmitq);
                tipc_group_update_rcv_win(tsk->group, tsk_blocks(hlen + dlen),
                                          msg_orignode(hdr), msg_origport(hdr),
                                          &xmitq);
@@ -2674,7 +2674,7 @@ static void tipc_sk_timeout(struct timer_list *t)
        struct sk_buff_head list;
        int rc = 0;
 
-       skb_queue_head_init(&list);
+       __skb_queue_head_init(&list);
        bh_lock_sock(sk);
 
        /* Try again later if socket is busy */