]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
tcp: remove an unnecessary check in tcp_tx_timestamp
authorSoheil Hassas Yeganeh <soheil@google.com>
Thu, 28 Apr 2016 03:39:00 +0000 (23:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Apr 2016 20:06:10 +0000 (16:06 -0400)
commit863c1fd9814618eefba02218f8fadf8a430c2a17
tree7c9ba0122ec2eb450b3d12dccbb3d847fc4628e7
parentba7863f4d3bfe1698e0a92934cbc9c3021f4448d
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>
net/ipv4/tcp.c