Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 14 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 56b8a96c2257..3eeb50a27b89 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -666,7 +666,7 @@ static int tipc_sendmcast(struct  socket *sock, struct tipc_name_seq *seq,
         struct tipc_sock *tsk = tipc_sk(sk);
         struct net *net = sock_net(sk);
         struct tipc_msg *mhdr = &tsk->phdr;
-        struct sk_buff_head *pktchain = &sk->sk_write_queue;
+        struct sk_buff_head pktchain;
         struct iov_iter save = msg->msg_iter;
         uint mtu;
         int rc;
@@ -680,14 +680,16 @@ static int tipc_sendmcast(struct  socket *sock, struct tipc_name_seq *seq,
         msg_set_nameupper(mhdr, seq->upper);
         msg_set_hdr_sz(mhdr, MCAST_H_SIZE);
 
+        skb_queue_head_init(&pktchain);
+
 new_mtu:
         mtu = tipc_bcast_get_mtu(net);
-        rc = tipc_msg_build(mhdr, msg, 0, dsz, mtu, pktchain);
+        rc = tipc_msg_build(mhdr, msg, 0, dsz, mtu, &pktchain);
         if (unlikely(rc < 0))
                 return rc;
 
         do {
-                rc = tipc_bcast_xmit(net, pktchain);
+                rc = tipc_bcast_xmit(net, &pktchain);
                 if (likely(!rc))
                         return dsz;
 
@@ -697,7 +699,7 @@ new_mtu:
                         if (!rc)
                                 continue;
                 }
-                __skb_queue_purge(pktchain);
+                __skb_queue_purge(&pktchain);
                 if (rc == -EMSGSIZE) {
                         msg->msg_iter = save;
                         goto new_mtu;
@@ -856,7 +858,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dsz)
         struct net *net = sock_net(sk);
         struct tipc_msg *mhdr = &tsk->phdr;
         u32 dnode, dport;
-        struct sk_buff_head *pktchain = &sk->sk_write_queue;
+        struct sk_buff_head pktchain;
         struct sk_buff *skb;
         struct tipc_name_seq *seq;
         struct iov_iter save;
@@ -917,17 +919,18 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dsz)
                 msg_set_hdr_sz(mhdr, BASIC_H_SIZE);
         }
 
+        skb_queue_head_init(&pktchain);
         save = m->msg_iter;
 new_mtu:
         mtu = tipc_node_get_mtu(net, dnode, tsk->portid);
-        rc = tipc_msg_build(mhdr, m, 0, dsz, mtu, pktchain);
+        rc = tipc_msg_build(mhdr, m, 0, dsz, mtu, &pktchain);
         if (rc < 0)
                 return rc;
 
         do {
-                skb = skb_peek(pktchain);
+                skb = skb_peek(&pktchain);
                 TIPC_SKB_CB(skb)->wakeup_pending = tsk->link_cong;
-                rc = tipc_node_xmit(net, pktchain, dnode, tsk->portid);
+                rc = tipc_node_xmit(net, &pktchain, dnode, tsk->portid);
                 if (likely(!rc)) {
                         if (sock->state != SS_READY)
                                 sock->state = SS_CONNECTING;
@@ -939,7 +942,7 @@ new_mtu:
                         if (!rc)
                                 continue;
                 }
-                __skb_queue_purge(pktchain);
+                __skb_queue_purge(&pktchain);
                 if (rc == -EMSGSIZE) {
                         m->msg_iter = save;
                         goto new_mtu;
@@ -1009,7 +1012,7 @@ static int __tipc_send_stream(struct socket *sock, struct msghdr *m, size_t dsz)
         struct net *net = sock_net(sk);
         struct tipc_sock *tsk = tipc_sk(sk);
         struct tipc_msg *mhdr = &tsk->phdr;
-        struct sk_buff_head *pktchain = &sk->sk_write_queue;
+        struct sk_buff_head pktchain;
         DECLARE_SOCKADDR(struct sockaddr_tipc *, dest, m->msg_name);
         u32 portid = tsk->portid;
         int rc = -EINVAL;
@@ -1037,17 +1040,19 @@ static int __tipc_send_stream(struct socket *sock, struct msghdr *m, size_t dsz)
 
         timeo = sock_sndtimeo(sk, m->msg_flags & MSG_DONTWAIT);
         dnode = tsk_peer_node(tsk);
+        skb_queue_head_init(&pktchain);
 
 next:
         save = m->msg_iter;
         mtu = tsk->max_pkt;
         send = min_t(uint, dsz - sent, TIPC_MAX_USER_MSG_SIZE);
-        rc = tipc_msg_build(mhdr, m, sent, send, mtu, pktchain);
+        rc = tipc_msg_build(mhdr, m, sent, send, mtu, &pktchain);
         if (unlikely(rc < 0))
                 return rc;
+
         do {
                 if (likely(!tsk_conn_cong(tsk))) {
-                        rc = tipc_node_xmit(net, pktchain, dnode, portid);
+                        rc = tipc_node_xmit(net, &pktchain, dnode, portid);
                         if (likely(!rc)) {
                                 tsk->sent_unacked++;
                                 sent += send;
@@ -1056,7 +1061,7 @@ next:
                                 goto next;
                         }
                         if (rc == -EMSGSIZE) {
-                                __skb_queue_purge(pktchain);
+                                __skb_queue_purge(&pktchain);
                                 tsk->max_pkt = tipc_node_get_mtu(net, dnode,
                                                                  portid);
                                 m->msg_iter = save;
@@ -1070,7 +1075,7 @@ next:
                 rc = tipc_wait_for_sndpkt(sock, &timeo);
         } while (!rc);
 
-        __skb_queue_purge(pktchain);
+        __skb_queue_purge(&pktchain);
         return sent ? sent : rc;
 }