Merge branch 'net-SO_TIMESTAMPING-fixes'

Browse source

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>

...

This commit is contained in:

David S. Miller 2018-12-17 23:27:01 -08:00

parent 255fe81a6a 8f932f762e

commit b33299017c

5 changed files with 28 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

include/net/sock.h

View file

2

net/can/raw.c

View file

2

net/ipv4/raw.c

View file

2

net/ipv6/raw.c

View file

6

net/packet/af_packet.c

View file