net-timestamp: only report sw timestamp if reporting bit is set

[karo-tx-linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 95ee7d8682e7447f45f5ddb0ddbde5fff196c84e..4eb09b34b2d351f884fe16d7b7bba3e28582b145 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -734,8 +734,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
        }
 
        memset(&tss, 0, sizeof(tss));
-       if ((sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE ||
-            skb_shinfo(skb)->tx_flags & SKBTX_ANY_SW_TSTAMP) &&
+       if ((sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE) &&
            ktime_to_timespec_cond(skb->tstamp, tss.ts + 0))
                empty = 0;
        if (shhwtstamps &&