2 files changed, 4 insertions, 12 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index ca9b65199d28..134291d73fcd 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -862,8 +862,6 @@ set_rcvbuf:
                                                (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE));
                 sock_valbool_flag(sk, SOCK_TIMESTAMPING_SOFTWARE,
                                   val & SOF_TIMESTAMPING_SOFTWARE);
-                sock_valbool_flag(sk, SOCK_TIMESTAMPING_SYS_HARDWARE,
-                                  val & SOF_TIMESTAMPING_SYS_HARDWARE);
                 sock_valbool_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE,
                                   val & SOF_TIMESTAMPING_RAW_HARDWARE);
                 break;
@@ -1102,8 +1100,6 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                         v.val |= SOF_TIMESTAMPING_RX_SOFTWARE;
                 if (sock_flag(sk, SOCK_TIMESTAMPING_SOFTWARE))
                         v.val |= SOF_TIMESTAMPING_SOFTWARE;
-                if (sock_flag(sk, SOCK_TIMESTAMPING_SYS_HARDWARE))
-                        v.val |= SOF_TIMESTAMPING_SYS_HARDWARE;
                 if (sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE))
                         v.val |= SOF_TIMESTAMPING_RAW_HARDWARE;
                 break;
diff --git a/net/socket.c b/net/socket.c
index abf56b2a14f9..d8222c025061 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -725,14 +725,10 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
         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) &&
-                    ktime_to_timespec_cond(shhwtstamps->syststamp, ts + 1))
-                        empty = 0;
-                if (sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE) &&
-                    ktime_to_timespec_cond(shhwtstamps->hwtstamp, ts + 2))
-                        empty = 0;
-        }
+        if (shhwtstamps &&
+            sock_flag(sk, SOCK_TIMESTAMPING_RAW_HARDWARE) &&
+            ktime_to_timespec_cond(shhwtstamps->hwtstamp, ts + 2))
+                empty = 0;
         if (!empty)
                 put_cmsg(msg, SOL_SOCKET,
                          SCM_TIMESTAMPING, sizeof(ts), &ts);