2 files changed, 5 insertions, 0 deletions

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index c9f68802e992..0df4f1d14c5a 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3522,6 +3522,8 @@ void skb_tstamp_tx(struct sk_buff *orig_skb,
         serr->ee.ee_errno = ENOMSG;
         serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
         serr->ee.ee_info = SCM_TSTAMP_SND;
+        if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)
+                serr->ee.ee_data = skb_shinfo(skb)->tskey;
 
         err = sock_queue_err_skb(sk, skb);
 
diff --git a/net/core/sock.c b/net/core/sock.c
index 47c9377e14b9..1e0f1c63ad6b 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -848,6 +848,9 @@ set_rcvbuf:
                         ret = -EINVAL;
                         break;
                 }
+                if (val & SOF_TIMESTAMPING_OPT_ID &&
+                    !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID))
+                        sk->sk_tskey = 0;
                 sk->sk_tsflags = val;
                 if (val & SOF_TIMESTAMPING_RX_SOFTWARE)
                         sock_enable_timestamp(sk,