Skip to content

Commit 4e8cc22

Browse files
Eric Dumazetdavem330
authored andcommitted
tcp: tcp_tx_timestamp() cleanup
tcp_write_queue_tail() call can be factorized. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ac3f09b commit 4e8cc22

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

net/ipv4/tcp.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,10 @@ void tcp_init_transfer(struct sock *sk, int bpf_op)
469469
tcp_init_buffer_space(sk);
470470
}
471471

472-
static void tcp_tx_timestamp(struct sock *sk, u16 tsflags, struct sk_buff *skb)
472+
static void tcp_tx_timestamp(struct sock *sk, u16 tsflags)
473473
{
474+
struct sk_buff *skb = tcp_write_queue_tail(sk);
475+
474476
if (tsflags && skb) {
475477
struct skb_shared_info *shinfo = skb_shinfo(skb);
476478
struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
@@ -1041,7 +1043,7 @@ ssize_t do_tcp_sendpages(struct sock *sk, struct page *page, int offset,
10411043

10421044
out:
10431045
if (copied) {
1044-
tcp_tx_timestamp(sk, sk->sk_tsflags, tcp_write_queue_tail(sk));
1046+
tcp_tx_timestamp(sk, sk->sk_tsflags);
10451047
if (!(flags & MSG_SENDPAGE_NOTLAST))
10461048
tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);
10471049
}
@@ -1418,7 +1420,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
14181420

14191421
out:
14201422
if (copied) {
1421-
tcp_tx_timestamp(sk, sockc.tsflags, tcp_write_queue_tail(sk));
1423+
tcp_tx_timestamp(sk, sockc.tsflags);
14221424
tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);
14231425
}
14241426
out_nopush:

0 commit comments

Comments
 (0)