tcp: remove size parameter from tcp_stream_alloc_skb()

Now all tcp_stream_alloc_skb() callers pass @size == 0, we can
remove this parameter.

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

diff --git a/include/net/tcp.h b/include/net/tcp.h
index f718ed258f07caedca41d01670b1c91fc11e2233..bf9f56225821fbb0b7a377b51b3b597b95985b4c 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -350,7 +350,7 @@ void tcp_twsk_purge(struct list_head *net_exit_list, int family);
 ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos,
                        struct pipe_inode_info *pipe, size_t len,
                        unsigned int flags);
-struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp,
+struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, gfp_t gfp,
                                     bool force_schedule);
 
 void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks);

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index da7f156d9fad93b0ab97cd52bc9e7f9cd3822ea2..fba6578bc98f98feae8afea522e113ea3994eea0 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -858,12 +858,12 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
 }
 EXPORT_SYMBOL(tcp_splice_read);
 
-struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp,
+struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, gfp_t gfp,
                                     bool force_schedule)
 {
        struct sk_buff *skb;
 
-       skb = alloc_skb_fclone(size + MAX_TCP_HEADER, gfp);
+       skb = alloc_skb_fclone(MAX_TCP_HEADER, gfp);
        if (likely(skb)) {
                bool mem_scheduled;
 
@@ -1178,7 +1178,7 @@ new_segment:
                                        goto restart;
                        }
                        first_skb = tcp_rtx_and_write_queues_empty(sk);
-                       skb = tcp_stream_alloc_skb(sk, 0, sk->sk_allocation,
+                       skb = tcp_stream_alloc_skb(sk, sk->sk_allocation,
                                                   first_skb);
                        if (!skb)
                                goto wait_for_space;

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index fedbe842abdd027a95f2ac7960185fd2906a04bc..660eac4bf2a77080def76b4ee8ae6fbfc4e13284 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1558,7 +1558,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,
                return -ENOMEM;
 
        /* Get a new skb... force flag on. */
-       buff = tcp_stream_alloc_skb(sk, 0, gfp, true);
+       buff = tcp_stream_alloc_skb(sk, gfp, true);
        if (!buff)
                return -ENOMEM; /* We'll just try again later. */
        skb_copy_decrypted(buff, skb);
@@ -2118,7 +2118,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
        /* All of a TSO frame must be composed of paged data.  */
        DEBUG_NET_WARN_ON_ONCE(skb->len != skb->data_len);
 
-       buff = tcp_stream_alloc_skb(sk, 0, gfp, true);
+       buff = tcp_stream_alloc_skb(sk, gfp, true);
        if (unlikely(!buff))
                return -ENOMEM;
        skb_copy_decrypted(buff, skb);
@@ -2434,7 +2434,7 @@ static int tcp_mtu_probe(struct sock *sk)
                return -1;
 
        /* We're allowed to probe.  Build it now. */
-       nskb = tcp_stream_alloc_skb(sk, 0, GFP_ATOMIC, false);
+       nskb = tcp_stream_alloc_skb(sk, GFP_ATOMIC, false);
        if (!nskb)
                return -1;
 
@@ -3811,7 +3811,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)
            !skb_page_frag_refill(min_t(size_t, space, PAGE_SIZE),
                                  pfrag, sk->sk_allocation))
                goto fallback;
-       syn_data = tcp_stream_alloc_skb(sk, 0, sk->sk_allocation, false);
+       syn_data = tcp_stream_alloc_skb(sk, sk->sk_allocation, false);
        if (!syn_data)
                goto fallback;
        memcpy(syn_data->cb, syn->cb, sizeof(syn->cb));
@@ -3896,7 +3896,7 @@ int tcp_connect(struct sock *sk)
                return 0;
        }
 
-       buff = tcp_stream_alloc_skb(sk, 0, sk->sk_allocation, true);
+       buff = tcp_stream_alloc_skb(sk, sk->sk_allocation, true);
        if (unlikely(!buff))
                return -ENOBUFS;