OSDN Git Service

tcp: tcp_tx_timestamp() cleanup
authorEric Dumazet <edumazet@google.com>
Fri, 6 Oct 2017 05:21:23 +0000 (22:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Oct 2017 23:28:53 +0000 (00:28 +0100)
tcp_write_queue_tail() call can be factorized.

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

index f8ebae6..b8d379c 100644 (file)
@@ -469,8 +469,10 @@ void tcp_init_transfer(struct sock *sk, int bpf_op)
        tcp_init_buffer_space(sk);
 }
 
-static void tcp_tx_timestamp(struct sock *sk, u16 tsflags, struct sk_buff *skb)
+static void tcp_tx_timestamp(struct sock *sk, u16 tsflags)
 {
+       struct sk_buff *skb = tcp_write_queue_tail(sk);
+
        if (tsflags && skb) {
                struct skb_shared_info *shinfo = skb_shinfo(skb);
                struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
@@ -1041,7 +1043,7 @@ wait_for_memory:
 
 out:
        if (copied) {
-               tcp_tx_timestamp(sk, sk->sk_tsflags, tcp_write_queue_tail(sk));
+               tcp_tx_timestamp(sk, sk->sk_tsflags);
                if (!(flags & MSG_SENDPAGE_NOTLAST))
                        tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);
        }
@@ -1418,7 +1420,7 @@ wait_for_memory:
 
 out:
        if (copied) {
-               tcp_tx_timestamp(sk, sockc.tsflags, tcp_write_queue_tail(sk));
+               tcp_tx_timestamp(sk, sockc.tsflags);
                tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);
        }
 out_nopush: