tcp: remove dead code from tcp_sendmsg_locked()
authorEric Dumazet <edumazet@google.com>
Wed, 27 Oct 2021 20:19:17 +0000 (13:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Oct 2021 11:44:38 +0000 (12:44 +0100)
TCP sendmsg() no longer puts payload in skb head, we can remove
dead code.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp.c

index d0b848f..4053ace 100644 (file)
@@ -1309,14 +1309,7 @@ new_segment:
                if (copy > msg_data_left(msg))
                        copy = msg_data_left(msg);
 
-               /* Where to copy to? */
-               if (skb_availroom(skb) > 0 && !zc) {
-                       /* We have some space in skb head. Superb! */
-                       copy = min_t(int, copy, skb_availroom(skb));
-                       err = skb_add_data_nocache(sk, skb, &msg->msg_iter, copy);
-                       if (err)
-                               goto do_fault;
-               } else if (!zc) {
+               if (!zc) {
                        bool merge = true;
                        int i = skb_shinfo(skb)->nr_frags;
                        struct page_frag *pfrag = sk_page_frag(sk);
@@ -1416,7 +1409,6 @@ out_nopush:
 
 do_error:
        skb = tcp_write_queue_tail(sk);
-do_fault:
        tcp_remove_empty_skb(sk, skb);
 
        if (copied + copied_syn)