From d3fbff306c215946cdbcf9ace4d0b78e9f72b5c4 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 31 Mar 2017 14:59:25 -0700 Subject: [PATCH] sock: correctly test SOCK_TIMESTAMP in sock_recv_ts_and_drops() It seems the code does not match the intent. This broke packetdrill, and probably other programs. Fixes: 6c7c98bad488 ("sock: avoid dirtying sk_stamp, if possible") Signed-off-by: Eric Dumazet Cc: Paolo Abeni Acked-by: Paolo Abeni Signed-off-by: David S. Miller --- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/sock.h b/include/net/sock.h index 8e53158a7d95..66349e49d468 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2250,7 +2250,7 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, if (sk->sk_flags & FLAGS_TS_OR_DROPS || sk->sk_tsflags & TSFLAGS_ANY) __sock_recv_ts_and_drops(msg, sk, skb); - else if (unlikely(sk->sk_flags & SOCK_TIMESTAMP)) + else if (unlikely(sock_flag(sk, SOCK_TIMESTAMP))) sk->sk_stamp = skb->tstamp; else if (unlikely(sk->sk_stamp == SK_DEFAULT_STAMP)) sk->sk_stamp = 0; -- 2.11.0