net-timestamp: add key to disambiguate concurrent datagrams

[cascardo/linux.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index c1a3303..0df4f1d 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3521,6 +3521,9 @@ void skb_tstamp_tx(struct sk_buff *orig_skb,
        memset(serr, 0, sizeof(*serr));
        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);