Message ID | 1461814741-848-2-git-send-email-soheil.kdev@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 2016-04-27 at 23:39 -0400, Soheil Hassas Yeganeh wrote: > From: Soheil Hassas Yeganeh <soheil@google.com> > > 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>
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 4d73858..3c542dc 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);