diff options
author | David S. Miller <davem@davemloft.net> | 2018-12-17 23:27:01 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-12-17 23:27:01 -0800 |
commit | b33299017ca7a303fa650e007ebfbcf57527fc8c (patch) | |
tree | e40f35dc20a9d45d774b78b9d42e2f4b0e8b2a64 /net/ipv6/raw.c | |
parent | 255fe81a6ad420258b6dac8c509c99cd1c233390 (diff) | |
parent | 8f932f762e7928d250e21006b00ff9b7718b0a64 (diff) |
Merge branch 'net-SO_TIMESTAMPING-fixes'
Willem de Bruijn says:
====================
net: SO_TIMESTAMPING fixes
Fix two omissions:
- tx timestamping is missing for AF_INET6/SOCK_RAW/IPPROTO_RAW
- SOF_TIMESTAMPING_OPT_ID is missing for IPPROTO_RAW, PF_PACKET, CAN
Discovered while expanding the selftest in
tools/testing/selftests/networking/timestamping/txtimestamp.c
Will send the test patchset to net-next once the fixes make it to that
branch. For now, it is available at
https://github.com/wdebruij/linux/commits/txtimestamp-test-1
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 5e0efd3954e90..fc2b5e845fdf3 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -658,6 +658,8 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length, skb->ip_summed = CHECKSUM_NONE; + skb_setup_tx_timestamp(skb, sockc->tsflags); + if (flags & MSG_CONFIRM) skb_set_dst_pending_confirm(skb, 1); |