Merge branch 'io_uring-zerocopy-send' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index df7f9df..d7bd1da 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1236,9 +1236,7 @@ alloc_new_skb:
 
                        pfrag->offset += copy;
                        skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
-                       skb->len += copy;
-                       skb->data_len += copy;
-                       skb->truesize += copy;
+                       skb_len_add(skb, copy);
                        wmem_alloc_delta += copy;
                } else {
                        err = skb_zerocopy_iter_dgram(skb, from, copy);
@@ -1465,9 +1463,7 @@ ssize_t   ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
                        skb->csum = csum_block_add(skb->csum, csum, skb->len);
                }
 
-               skb->len += len;
-               skb->data_len += len;
-               skb->truesize += len;
+               skb_len_add(skb, len);
                refcount_add(len, &sk->sk_wmem_alloc);
                offset += len;
                size -= len;
@@ -1726,7 +1722,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,
                           tcp_hdr(skb)->source, tcp_hdr(skb)->dest,
                           arg->uid);
        security_skb_classify_flow(skb, flowi4_to_flowi_common(&fl4));
-       rt = ip_route_output_key(net, &fl4);
+       rt = ip_route_output_flow(net, &fl4, sk);
        if (IS_ERR(rt))
                return;