1 files changed, 8 insertions, 5 deletions

diff --git a/net/socket.c b/net/socket.c
index 1de96abd78d3..d51930689b98 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -706,7 +706,8 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
 {
         int need_software_tstamp = sock_flag(sk, SOCK_RCVTSTAMP);
         int new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW);
-        struct scm_timestamping tss;
+        struct scm_timestamping_internal tss;
+
         int empty = 1, false_tstamp = 0;
         struct skb_shared_hwtstamps *shhwtstamps =
                 skb_hwtstamps(skb);
@@ -752,20 +753,22 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
 
         memset(&tss, 0, sizeof(tss));
         if ((sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE) &&
-            ktime_to_timespec_cond(skb->tstamp, tss.ts + 0))
+            ktime_to_timespec64_cond(skb->tstamp, tss.ts + 0))
                 empty = 0;
         if (shhwtstamps &&
             (sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE) &&
             !skb_is_swtx_tstamp(skb, false_tstamp) &&
-            ktime_to_timespec_cond(shhwtstamps->hwtstamp, tss.ts + 2)) {
+            ktime_to_timespec64_cond(shhwtstamps->hwtstamp, tss.ts + 2)) {
                 empty = 0;
                 if ((sk->sk_tsflags & SOF_TIMESTAMPING_OPT_PKTINFO) &&
                     !skb_is_err_queue(skb))
                         put_ts_pktinfo(msg, skb);
         }
         if (!empty) {
-                put_cmsg(msg, SOL_SOCKET,
-                         SO_TIMESTAMPING_OLD, sizeof(tss), &tss);
+                if (sock_flag(sk, SOCK_TSTAMP_NEW))
+                        put_cmsg_scm_timestamping64(msg, &tss);
+                else
+                        put_cmsg_scm_timestamping(msg, &tss);
 
                 if (skb_is_err_queue(skb) && skb->len &&
                     SKB_EXT_ERR(skb)->opt_stats)