diff options
| author | Soheil Hassas Yeganeh <soheil@google.com> | 2016-04-27 23:39:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 16:06:10 -0400 |
| commit | 863c1fd9814618eefba02218f8fadf8a430c2a17 (patch) | |
| tree | 7c9ba0122ec2eb450b3d12dccbb3d847fc4628e7 /net/ipv4/tcp.c | |
| parent | ba7863f4d3bfe1698e0a92934cbc9c3021f4448d (diff) | |
| download | linux-863c1fd9814618eefba02218f8fadf8a430c2a17.tar.gz linux-863c1fd9814618eefba02218f8fadf8a430c2a17.tar.xz | |
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>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 040f35e7efe0..53890a730ff4 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -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); |