Commit b50edd78 authored Apr 09, 2015 by Eric Dumazet Committed by David S. Miller Apr 09, 2015

tcp: tcp_make_synack() should clear skb->tstamp



I noticed tcpdump was giving funky timestamps for locally
generated SYNACK messages on loopback interface.

11:42:46.938990 IP 127.0.0.1.48245 > 127.0.0.2.23850: S
945476042:945476042(0) win 43690 <mss 65495,nop,nop,sackOK,nop,wscale 7>

20:28:58.502209 IP 127.0.0.2.23850 > 127.0.0.1.48245: S
3160535375:3160535375(0) ack 945476043 win 43690 <mss
65495,nop,nop,sackOK,nop,wscale 7>

This is because we need to clear skb->tstamp before
entering lower stack, otherwise net_timestamp_check()
does not set skb->tstamp.

Fixes: 7faee5c0 ("tcp: remove TCP_SKB_CB(skb)->when")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b736a623

net/ipv4/tcp_output.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2929,6 +2929,8 @@ struct sk_buff tcp_make_synack(struct sock sk, struct dst_entry *dst,
	}		}
	#endif		#endif

			/* Do not fool tcpdump (if any), clean our debris */
			skb->tstamp.tv64 = 0;
	return skb;		return skb;
	}		}
	EXPORT_SYMBOL(tcp_make_synack);		EXPORT_SYMBOL(tcp_make_synack);