Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f066e2b0 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

net-timestamp: cumulative tcp timestamping fixes 



A set of small fixes pointed out just after the merge:
- make tcp_tx_timestamp static
- make tcp_gso_tstamp static
- use before() to compare TCP seqno, instead of cast to u64
- add tstamp to tx_flags in GSO, instead of overwrite tx_flags
- record skb_shinfo(skb)->tskey for all timestamps, also HW.
- optimization in tcp_tx_timestamp:
  call sock_tx_timestamp only if a tstamp option is set.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Fixes: 4ed2d765 ("net-timestamp: TCP timestamping")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be136ed3

net/ipv4/tcp.c

+7 −5
Original line number Diff line number Diff line
@@ -426,14 +426,16 @@ void tcp_init_sock(struct sock *sk) 
}

EXPORT_SYMBOL(tcp_init_sock);



void tcp_tx_timestamp(struct sock *sk, struct sk_buff *skb)

static void tcp_tx_timestamp(struct sock *sk, struct sk_buff *skb)

{

	if (sk->sk_tsflags) {

		struct skb_shared_info *shinfo = skb_shinfo(skb);



		sock_tx_timestamp(sk, &shinfo->tx_flags);

	if (shinfo->tx_flags & SKBTX_ANY_SW_TSTAMP)

		if (shinfo->tx_flags & SKBTX_ANY_TSTAMP)

			shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1;

	}

}



/*

 *	Wait for a TCP event.

net/ipv4/tcp_offload.c

+4 −4
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#include <net/tcp.h>

#include <net/protocol.h>



void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, unsigned int seq,

		    unsigned int mss)

static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq,

			   unsigned int seq, unsigned int mss)

{

	while (skb) {

		if (ts_seq < (__u64) seq + mss) {

			skb_shinfo(skb)->tx_flags = SKBTX_SW_TSTAMP;

		if (before(ts_seq, seq + mss)) {

			skb_shinfo(skb)->tx_flags |= SKBTX_SW_TSTAMP;

			skb_shinfo(skb)->tskey = ts_seq;

			return;

		}