summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2018-12-17 12:24:00 -0500
committerDavid S. Miller <davem@davemloft.net>2018-12-17 23:27:00 -0800
commit8f932f762e7928d250e21006b00ff9b7718b0a64 (patch)
treee40f35dc20a9d45d774b78b9d42e2f4b0e8b2a64 /net/can
parentfbfb2321e950918b430e7225546296b2dcadf725 (diff)
downloadlinux-stable-8f932f762e7928d250e21006b00ff9b7718b0a64.tar.gz
linux-stable-8f932f762e7928d250e21006b00ff9b7718b0a64.tar.bz2
linux-stable-8f932f762e7928d250e21006b00ff9b7718b0a64.zip
net: add missing SOF_TIMESTAMPING_OPT_ID support
SOF_TIMESTAMPING_OPT_ID is supported on TCP, UDP and RAW sockets. But it was missing on RAW with IPPROTO_IP, PF_PACKET and CAN. Add skb_setup_tx_timestamp that configures both tx_flags and tskey for these paths that do not need corking or use bytestream keys. Fixes: 09c2d251b707 ("net-timestamp: add key to disambiguate concurrent datagrams") Signed-off-by: Willem de Bruijn <willemb@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/raw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index 3aab7664933f..c70207537488 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -771,7 +771,7 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
if (err < 0)
goto free_skb;
- sock_tx_timestamp(sk, sk->sk_tsflags, &skb_shinfo(skb)->tx_flags);
+ skb_setup_tx_timestamp(skb, sk->sk_tsflags);
skb->dev = dev;
skb->sk = sk;