Commit 863c1fd9 authored Apr 27, 2016 by Soheil Hassas Yeganeh Committed by David S. Miller Apr 28, 2016

tcp: remove an unnecessary check in tcp_tx_timestamp



Remove the redundant check for sk->sk_tsflags in tcp_tx_timestamp.

tcp_tx_timestamp() receives the tsflags as a parameter. As a
result the "sk->sk_tsflags || tsflags" is redundant, since
tsflags already includes sk->sk_tsflags plus overrides from
control messages.

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

parent ba7863f4

net/ipv4/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -430,7 +430,7 @@ EXPORT_SYMBOL(tcp_init_sock);

		static void tcp_tx_timestamp(struct sock sk, u16 tsflags, struct sk_buff skb)
		{
		if (sk->sk_tsflags \|\| tsflags) {
		if (tsflags) {
		struct skb_shared_info *shinfo = skb_shinfo(skb);
		struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);