UBUNTU: Start new release

[mirror_ubuntu-zesty-kernel.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index bfdb35898e4c35e3199471a96826e1b968caeeb3..6361d3161120be2ad509b356166e7395afb21b9e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -708,7 +708,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
                         SCM_TIMESTAMPING, sizeof(tss), &tss);
 
                if (skb_is_err_queue(skb) && skb->len &&
-                   (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS))
+                   SKB_EXT_ERR(skb)->opt_stats)
                        put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_OPT_STATS,
                                 skb->len, skb->data);
        }