1 files changed, 4 insertions, 16 deletions

diff --git a/net/socket.c b/net/socket.c
index 36883fea44f3..280283f03ccc 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -681,16 +681,6 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
 }
 EXPORT_SYMBOL(kernel_sendmsg);
 
-static int ktime2ts(ktime_t kt, struct timespec *ts)
-{
-        if (kt.tv64) {
-                *ts = ktime_to_timespec(kt);
-                return 1;
-        } else {
-                return 0;
-        }
-}
-
 /*
  * called from sock_recv_timestamp() if sock_flag(sk, SOCK_RCVTSTAMP)
  */
@@ -723,17 +713,15 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
 
 
         memset(ts, 0, sizeof(ts));
-        if (skb->tstamp.tv64 &&
-            sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE)) {
-                skb_get_timestampns(skb, ts + 0);
+        if (sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE) &&
+            ktime_to_timespec_cond(skb->tstamp, ts + 0))
                 empty = 0;
-        }
         if (shhwtstamps) {
                 if (sock_flag(sk, SOCK_TIMESTAMPING_SYS_HARDWARE) &&
-                    ktime2ts(shhwtstamps->syststamp, ts + 1))
+                    ktime_to_timespec_cond(shhwtstamps->syststamp, ts + 1))
                         empty = 0;
                 if (sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE) &&
-                    ktime2ts(shhwtstamps->hwtstamp, ts + 2))
+                    ktime_to_timespec_cond(shhwtstamps->hwtstamp, ts + 2))
                         empty = 0;
         }
         if (!empty)