1 files changed, 9 insertions, 9 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index a3366c3c837a..9583639090d2 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -244,7 +244,7 @@ struct sock {
         struct sk_filter        *sk_filter;
         void                    *sk_protinfo;
         struct timer_list       sk_timer;
-        struct timeval          sk_stamp;
+        ktime_t                 sk_stamp;
         struct socket           *sk_socket;
         void                    *sk_user_data;
         struct page             *sk_sndmsg_page;
@@ -1307,19 +1307,19 @@ static inline int sock_intr_errno(long timeo)
 static __inline__ void
 sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 {
-        struct timeval stamp;
+        ktime_t kt = skb->tstamp;
 
-        skb_get_timestamp(skb, &stamp);
         if (sock_flag(sk, SOCK_RCVTSTAMP)) {
+                struct timeval tv;
                 /* Race occurred between timestamp enabling and packet
                    receiving.  Fill in the current time for now. */
-                if (stamp.tv_sec == 0)
-                        do_gettimeofday(&stamp);
-                skb_set_timestamp(skb, &stamp);
-                put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(struct timeval),
-                         &stamp);
+                if (kt.tv64 == 0)
+                        kt = ktime_get_real();
+                skb->tstamp = kt;
+                tv = ktime_to_timeval(kt);
+                put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMP, sizeof(tv), &tv);
         } else
-                sk->sk_stamp = stamp;
+                sk->sk_stamp = kt;
 }
 
 /**